Skip to content

Commit

Permalink
Add PHP 8.4 support
Browse files Browse the repository at this point in the history
  • Loading branch information
arnested committed Nov 22, 2024
1 parent 5684924 commit e4c2bea
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 4 deletions.
6 changes: 4 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ FROM php:8.0-fpm-alpine@sha256:bbf76d84a693fae1e0d2a259db70c9c47f41bd5a6ec3d339b
FROM php:8.1-fpm-alpine@sha256:8ac8bf3413dc08471bb8134846018f19ec688c961d2581493bd7fe91cd72b9d2 AS php8.1
FROM php:8.2-fpm-alpine@sha256:1a6fc2aaa306a3c12264b3d1d6832a598e98f1237090ff853dc6af5db8e5a8f2 AS php8.2
FROM php:8.3-fpm-alpine@sha256:17fa7702b3d48eb0c064e3410474c81f703b3bcb7a7fe8073503e6c7f157a29a AS php8.3
FROM php:8.4-fpm-alpine@sha256:79e748df9762464b4fbd27c079150b3fb5535bcdd1550daacf6dfce60fb9fb86 AS php8.4

## Helper images
FROM blackfire/blackfire:2@sha256:17d628b0d16b1c297c1a346118d8d134e4f43e0c07658cee1bbb316cf693fc0a AS blackfire
Expand All @@ -16,7 +17,7 @@ FROM mlocati/php-extension-installer:2@sha256:0b77a6b5d06eda448cd5833ad881208a43
FROM php${php}

ARG php=${php}
ARG php_enable_extensions="apcu bcmath calendar ctype curl dom exif fileinfo ftp gd gettext iconv imagick/imagick@master intl json mbstring memcache memcached mysqli mysqlnd opcache pdo pdo_mysql pdo_sqlite phar posix readline redis shmop simplexml soap sockets sqlite3 sysvmsg sysvsem sysvshm tokenizer xml xmlreader xmlwriter xsl zip"
ARG php_enable_extensions="apcu bcmath calendar ctype curl dom exif fileinfo ftp gd gettext iconv intl json mbstring memcache memcached mysqli mysqlnd opcache pdo pdo_mysql pdo_sqlite phar posix readline redis shmop simplexml soap sockets sqlite3 sysvmsg sysvsem sysvshm tokenizer xml xmlreader xmlwriter xsl zip"
ARG php_install_extensions="blackfire xdebug"

HEALTHCHECK --interval=10s --start-period=90s CMD netstat -ltn | grep -c ":9000"
Expand All @@ -29,7 +30,8 @@ RUN <<EOT
set -eux
apk add --no-cache bash=~5 git=~2 jq=~1 mariadb-client=~10 msmtp=~1 patch=~2 unzip=~6 graphicsmagick=~1 sudo=~1 tini=~0
install-php-extensions ${php_enable_extensions}
IPE_DONT_ENABLE=1 install-php-extensions ${php_install_extensions}
if [ "${php}" != "8.4" ]; then install-php-extensions imagick; fi
if [ "${php}" != "8.4" ]; then IPE_DONT_ENABLE=1 install-php-extensions ${php_install_extensions}; fi
adduser -H -D -S -G wheel -u 501 machost
adduser -H -D -S -G wheel -u 1000 linuxhost
EOT
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ The images come with the following extensions installed and enabled:
- gd
- gettext
- iconv
- imagick
- intl
- json
- mbstring
Expand Down Expand Up @@ -110,8 +109,10 @@ The images come with the following extensions installed and enabled:
- xsl
- zip

`imagick` is installed on all images, except PHP 8.4.

In addition, the `xdebug` and `blackfire` extensions are installed but
not enabled in the images.
not enabled in the images (except on PHP 8.4).

The
[php-extension-installer](https://github.com/mlocati/docker-php-extension-installer)
Expand Down

0 comments on commit e4c2bea

Please sign in to comment.