Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor tunings #378

Merged
merged 2 commits into from
Jan 7, 2025
Merged

Minor tunings #378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d407772
Default to PHP 8.3 if not specified
arnested Jan 7, 2025
5ced542
Xdebug extension is now installable on PHP 8.4
arnested Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG php="8.2"
ARG php="8.3"

## Base PHP images
FROM php:8.1-fpm-alpine@sha256:e47e95fff703c5d51ef8b9d8c2bbc9a0fa21d7b2612338ed31a9395ba619758b AS php8.1
Expand All @@ -17,7 +17,6 @@ FROM php${php}

ARG php=${php}
ARG php_enable_extensions="apcu bcmath calendar ctype curl dom exif fileinfo ftp gd gettext iconv imagick 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 +28,8 @@ RUN <<EOT
set -eux
apk add --no-cache bash=~5 git=~2 jq=~1 mariadb-client=~11 msmtp=~1 patch=~2 unzip=~6 graphicsmagick=~1 sudo=~1 tini=~0
install-php-extensions ${php_enable_extensions}
if [ "${php}" != "8.4" ]; then IPE_DONT_ENABLE=1 install-php-extensions ${php_install_extensions}; fi
if [ "${php}" != "8.4" ]; then IPE_DONT_ENABLE=1 install-php-extensions blackfire; fi
IPE_DONT_ENABLE=1 install-php-extensions xdebug
adduser -H -D -S -G wheel -u 501 machost
adduser -H -D -S -G wheel -u 1000 linuxhost
EOT
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,8 @@ The images come with the following extensions installed and enabled:
- xsl
- zip

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

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