Skip to content

Commit

Permalink
Update PHP Version. Introduce Alpine 3.20. ReadME update
Browse files Browse the repository at this point in the history
alexanderM91 committed Jul 3, 2024
1 parent b72a23b commit fca7a2b
Showing 10 changed files with 63 additions and 226 deletions.
19 changes: 8 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -10,17 +10,6 @@ jobs:
matrix:
include:
## Alpine
### Alpine 3.16
- image: "alpine/3.16/8.0/Dockerfile"
tags: [ "spryker/php:8.0", "spryker/php:8.0-alpine3.16" ]
platforms: [ "linux/amd64", "linux/arm64" ]
- image: "alpine/3.16/8.1/Dockerfile"
tags: [ "spryker/php:8.1-alpine3.16" ]
platforms: [ "linux/amd64", "linux/arm64" ]
- image: "alpine/3.16/8.2/Dockerfile"
tags: [ "spryker/php:8.2-alpine3.16" ]
platforms: [ "linux/amd64", "linux/arm64" ]

### Alpine 3.17
- image: "alpine/3.17/8.1/Dockerfile"
tags: [ "spryker/php:8.1-alpine3.17" ]
@@ -45,6 +34,14 @@ jobs:
tags: [ "spryker/php:latest", "spryker/php:8.2", "spryker/php:8.2-alpine3.19" ]
platforms: [ "linux/amd64", "linux/arm64" ]

### Alpine 3.20
- image: "alpine/3.20/8.1/Dockerfile"
tags: [ "spryker/php:8.1-alpine3.20" ]
platforms: [ "linux/amd64", "linux/arm64" ]
- image: "alpine/3.20/8.2/Dockerfile"
tags: [ "spryker/php:8.2-alpine3.20" ]
platforms: [ "linux/amd64", "linux/arm64" ]

## Debian
### Debian bullseye
- image: "debian/bullseye/8.0/Dockerfile"
23 changes: 12 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -28,20 +28,21 @@ Extends official PHP Docker images with extensions and tools to be able to run S
## Tags

| Tag | PHP version | Linux distribution | Details | Dockerfile |
|:--------------------------------------------------------------------------------------------|:------------|:-------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-------------------------------------------------------------------------------------------|
| [spryker/php:latest](https://hub.docker.com/r/spryker/php/tags?name=latest) | 8.2.18 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:latest.svg)](https://microbadger.com/images/spryker/php:latest "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.2/Dockerfile) |
| [spryker/php:8.2](https://hub.docker.com/r/spryker/php/tags?name=8.2) | 8.2.18 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2.svg)](https://microbadger.com/images/spryker/php:8.2 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.2/Dockerfile) |
| [spryker/php:8.1](https://hub.docker.com/r/spryker/php/tags?name=8.1) | 8.1.28 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1.svg)](https://microbadger.com/images/spryker/php:8.1 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.1/Dockerfile) || [spryker/php:8.0](https://hub.docker.com/r/spryker/php/tags?name=8.0) | 8.0.28 | Alpine 3.16 | [![](https://images.microbadger.com/badges/image/spryker/php:8.0.svg)](https://microbadger.com/images/spryker/php:8.0 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.16/8.0/Dockerfile) |
| [spryker/php:8.2-alpine3.18](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.18) | 8.2.18 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.18.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.18 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.2/Dockerfile) |
| Tag | PHP version | Linux distribution | Details | Dockerfile |
|:--------------------------------------------------------------------------------------------|:------------|:-------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------------------------------------------------------------------------------------|
| [spryker/php:latest](https://hub.docker.com/r/spryker/php/tags?name=latest) | 8.2.20 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:latest.svg)](https://microbadger.com/images/spryker/php:latest "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.2/Dockerfile) |
| [spryker/php:8.2](https://hub.docker.com/r/spryker/php/tags?name=8.2) | 8.2.20 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2.svg)](https://microbadger.com/images/spryker/php:8.2 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.2/Dockerfile) |
| [spryker/php:8.1](https://hub.docker.com/r/spryker/php/tags?name=8.1) | 8.1.29 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1.svg)](https://microbadger.com/images/spryker/php:8.1 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.1/Dockerfile) |
| [spryker/php:8.2-alpine3.20](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.20) | 8.2.20 | Alpine 3.20 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.20.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.20 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.20/8.2/Dockerfile) |
| [spryker/php:8.1-alpine3.20](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.20) | 8.1.29 | Alpine 3.20 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.20.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.20 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.20/8.1/Dockerfile) |
| [spryker/php:8.2-alpine3.19](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.19) | 8.2.20 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.19.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.19 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.2/Dockerfile) |
| [spryker/php:8.1-alpine3.20](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.20) | 8.1.29 | Alpine 3.19 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.19.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.19 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.19/8.1/Dockerfile) |
| [spryker/php:8.2-alpine3.18](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.18) | 8.2.19 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.18.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.18 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.2/Dockerfile) |
| [spryker/php:8.1-alpine3.18](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.18) | 8.1.28 | Alpine 3.18 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.18.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.18 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.18/8.1/Dockerfile) |
| [spryker/php:8.2-alpine3.17](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.17) | 8.2.13 | Alpine 3.17 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.17.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.17 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.17/8.2/Dockerfile) |
| [spryker/php:8.1-alpine3.17](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.17) | 8.1.26 | Alpine 3.17 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.17.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.17 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.16/8.1/Dockerfile) |
| [spryker/php:8.2-alpine3.16](https://hub.docker.com/r/spryker/php/tags?name=8.2-alpine3.16) | 8.2.5 | Alpine 3.16 | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-alpine3.16.svg)](https://microbadger.com/images/spryker/php:8.2-alpine3.16 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.16/8.2/Dockerfile) |
| [spryker/php:8.1-alpine3.16](https://hub.docker.com/r/spryker/php/tags?name=8.1-alpine3.16) | 8.1.26 | Alpine 3.16 | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-alpine3.16.svg)](https://microbadger.com/images/spryker/php:8.1-alpine3.16 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.16/8.1/Dockerfile) |
| [spryker/php:8.0-alpine3.16](https://hub.docker.com/r/spryker/php/tags?name=8.0-alpine3.16) | 8.0.30 | Alpine 3.16 | [![](https://images.microbadger.com/badges/image/spryker/php:8.0-alpine3.16.svg)](https://microbadger.com/images/spryker/php:8.0-alpine3.16 "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/alpine/3.16/8.0/Dockerfile) |
| [spryker/php:8.2-debian](https://hub.docker.com/r/spryker/php/tags?name=8.2-debian) | 8.2.18 | Debian "bullseye" | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-debian.svg)](https://microbadger.com/images/spryker/php:8.2-debian "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/debian/bullseye/8.2/Dockerfile) |
| [spryker/php:8.1-debian](https://hub.docker.com/r/spryker/php/tags?name=8.1-debian) | 8.1.28 | Debian "bullseye" | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-debian.svg)](https://microbadger.com/images/spryker/php:8.1-debian "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/debian/bullseye/8.1/Dockerfile) |
| [spryker/php:8.2-debian](https://hub.docker.com/r/spryker/php/tags?name=8.2-debian) | 8.2.20 | Debian "bullseye" | [![](https://images.microbadger.com/badges/image/spryker/php:8.2-debian.svg)](https://microbadger.com/images/spryker/php:8.2-debian "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/debian/bullseye/8.2/Dockerfile) |
| [spryker/php:8.1-debian](https://hub.docker.com/r/spryker/php/tags?name=8.1-debian) | 8.1.29 | Debian "bullseye" | [![](https://images.microbadger.com/badges/image/spryker/php:8.1-debian.svg)](https://microbadger.com/images/spryker/php:8.1-debian "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/debian/bullseye/8.1/Dockerfile) |
| [spryker/php:8.0-debian](https://hub.docker.com/r/spryker/php/tags?name=8.0-debian) | 8.0.30 | Debian "bullseye" | [![](https://images.microbadger.com/badges/image/spryker/php:8.0-debian.svg)](https://microbadger.com/images/spryker/php:8.0-debian "Get your own image badge on microbadger.com") | [:link:](https://github.com/spryker/docker-php/blob/master/debian/bullseye/8.0/Dockerfile) |
## How to use

187 changes: 0 additions & 187 deletions alpine/3.16/8.0/Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion alpine/3.18/8.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.0.2-experimental
ARG SPRYKER_PHP_VERSION=8.2.18
ARG SPRYKER_PHP_VERSION=8.2.19

FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.18

2 changes: 1 addition & 1 deletion alpine/3.19/8.1/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.0.2-experimental
ARG SPRYKER_PHP_VERSION=8.1.28
ARG SPRYKER_PHP_VERSION=8.1.29

FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.19

2 changes: 1 addition & 1 deletion alpine/3.19/8.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.0.2-experimental
ARG SPRYKER_PHP_VERSION=8.2.18
ARG SPRYKER_PHP_VERSION=8.2.20

FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.19

26 changes: 19 additions & 7 deletions alpine/3.16/8.1/Dockerfile → alpine/3.20/8.1/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# syntax = docker/dockerfile:1.0.2-experimental
ARG SPRYKER_PHP_VERSION=8.1.26
ARG SPRYKER_PHP_VERSION=8.1.29

FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.16
FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.20

ARG TARGETPLATFORM
ARG COMPOSER_VERSION=2.6.6
ARG BLACKFIRE_VERSION=1.87.1
ARG BLACKFIRE_PHP_VERSION=81
ARG NEWRELIC_VERSION=10.16.0.5
ARG TIDEWAYS_VERSION=5.5.8
ARG TIDEWAYS_VERSION=5.5.14
ARG TIDEWAYS_PHP_VERSION=8.1

ENV srcRoot /data
@@ -71,6 +71,9 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\
xdebug \
xhprof"

ARG GRAPHVIZ_BUILD_DEPS="\
expat-dev"

ARG CFLAGS="-I/usr/src/php"
RUN apk update \
&& apk upgrade \
@@ -80,12 +83,10 @@ RUN apk update \
curl \
g++ \
git \
graphviz \
make \
mysql-client \
netcat-openbsd \
openssh \
openssl \
postgresql-client \
procps \
python3 \
@@ -95,6 +96,8 @@ RUN apk update \
${PHP_RUN_DEPS} \
&& \
apk add --no-cache --virtual .php-build-deps ${PHP_BUILD_DEPS} \
&& \
apk add --no-cache --virtual .graphviz-build-deps ${GRAPHVIZ_BUILD_DEPS} \
&& rm -rf /var/lib/apt/lists/ \
&& \
docker-php-ext-configure gd \
@@ -134,8 +137,7 @@ RUN bash -c 'curl -L "https://download.newrelic.com/php_agent/archive/${NEWRELIC
&& /tmp/newrelic-php5-*/newrelic-install install \
&& rm -rf /tmp/newrelic-php5-* /tmp/nrinstall* \
&& /usr/bin/install -d -m 777 /var/log/newrelic/ \
&& rm /usr/local/etc/php/conf.d/newrelic.ini \
&& ln -s /lib64/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2'
&& rm /usr/local/etc/php/conf.d/newrelic.ini'

# Tideways
ENV TIDEWAYS_APIKEY=''
@@ -151,6 +153,16 @@ RUN bash -c 'if [ "${TARGETPLATFORM}" == "linux/arm64" ]; then \
&& tar xvzf tideways-php-${TIDEWAYS_VERSION}-alpine-arm64.tar.gz \
&& cp ./build/dist/tideways-php-alpine-${TIDEWAYS_PHP_VERSION}.so $(php-config --extension-dir)/tideways.so; fi'

# GraphViz 7.0.5
RUN cd /tmp && \
curl -L https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/7.0.5/graphviz-7.0.5.tar.gz | tar -zx && \
cd /tmp/graphviz-7.0.5 && \
./configure && \
make && \
make install && \
rm -rf /tmp/graphviz-7.0.5 && \
apk del --no-cache .graphviz-build-deps

# Opcache
RUN /usr/bin/install -d -m 777 /var/run/opcache

24 changes: 19 additions & 5 deletions alpine/3.16/8.2/Dockerfile → alpine/3.20/8.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax = docker/dockerfile:1.0.2-experimental
ARG SPRYKER_PHP_VERSION=8.2.5
ARG SPRYKER_PHP_VERSION=8.2.20

FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.16
FROM php:${SPRYKER_PHP_VERSION}-fpm-alpine3.20

ARG TARGETPLATFORM
ARG COMPOSER_VERSION=2.6.6
@@ -49,6 +49,7 @@ ARG PHP_BUILD_DEPS="\
ARG PHP_EXTENSIONS="\
bcmath \
bz2 \
ftp \
gd \
gmp \
intl \
@@ -71,6 +72,9 @@ ARG ADDITIONAL_PHP_PECL_EXTENSIONS="\
xdebug \
xhprof"

ARG GRAPHVIZ_BUILD_DEPS="\
expat-dev"

ARG CFLAGS="-I/usr/src/php"
RUN apk update \
&& apk upgrade \
@@ -80,7 +84,6 @@ RUN apk update \
curl \
g++ \
git \
graphviz \
make \
mysql-client \
netcat-openbsd \
@@ -94,6 +97,8 @@ RUN apk update \
${PHP_RUN_DEPS} \
&& \
apk add --no-cache --virtual .php-build-deps ${PHP_BUILD_DEPS} \
&& \
apk add --no-cache --virtual .graphviz-build-deps ${GRAPHVIZ_BUILD_DEPS} \
&& rm -rf /var/lib/apt/lists/ \
&& \
docker-php-ext-configure gd \
@@ -133,8 +138,7 @@ RUN bash -c 'curl -L "https://download.newrelic.com/php_agent/archive/${NEWRELIC
&& /tmp/newrelic-php5-*/newrelic-install install \
&& rm -rf /tmp/newrelic-php5-* /tmp/nrinstall* \
&& /usr/bin/install -d -m 777 /var/log/newrelic/ \
&& rm /usr/local/etc/php/conf.d/newrelic.ini \
&& ln -s /lib64/ld-linux-x86-64.so.2 /lib/ld-linux-x86-64.so.2'
&& rm /usr/local/etc/php/conf.d/newrelic.ini'

# Tideways
ENV TIDEWAYS_APIKEY=''
@@ -150,6 +154,16 @@ RUN bash -c 'if [ "${TARGETPLATFORM}" == "linux/arm64" ]; then \
&& tar xvzf tideways-php-${TIDEWAYS_VERSION}-alpine-arm64.tar.gz \
&& cp ./build/dist/tideways-php-alpine-${TIDEWAYS_PHP_VERSION}.so $(php-config --extension-dir)/tideways.so; fi'

# GraphViz 7.0.5
RUN cd /tmp && \
curl -L https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/7.0.5/graphviz-7.0.5.tar.gz | tar -zx && \
cd /tmp/graphviz-7.0.5 && \
./configure && \
make && \
make install && \
rm -rf /tmp/graphviz-7.0.5 && \
apk del --no-cache .graphviz-build-deps

# Opcache
RUN /usr/bin/install -d -m 777 /var/run/opcache

2 changes: 1 addition & 1 deletion debian/bullseye/8.1/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.0.2-experimental
ARG SPRYKER_PHP_VERSION=8.1.28
ARG SPRYKER_PHP_VERSION=8.1.29

FROM php:${SPRYKER_PHP_VERSION}-fpm-bullseye

2 changes: 1 addition & 1 deletion debian/bullseye/8.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax = docker/dockerfile:1.0.2-experimental
ARG SPRYKER_PHP_VERSION=8.2.18
ARG SPRYKER_PHP_VERSION=8.2.20

FROM php:${SPRYKER_PHP_VERSION}-fpm-bullseye

0 comments on commit fca7a2b

Please sign in to comment.