From 5879004af79431a8c282fca5ea5774427be1160c Mon Sep 17 00:00:00 2001 From: Ievgenii Kovtun Date: Thu, 14 Dec 2023 22:16:12 +0100 Subject: [PATCH 1/5] upgrade to php 8.3.0 --- Dockerfile | 2 +- docs/versioning.md | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5a75d1e0..cd6473ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.7-fpm-alpine3.18 +FROM php:8.3.0-fpm-alpine3.18 LABEL maintainer="Ric Harvey " diff --git a/docs/versioning.md b/docs/versioning.md index ebbf0339..68f475dc 100644 --- a/docs/versioning.md +++ b/docs/versioning.md @@ -13,6 +13,12 @@ We will use the [semver](http://ricostacruz.com/cheatsheets/semver.html) style n The latest tag will always follow the main branch in git. the other versions will have releases attached. +#### PHP 8.3.x + +| Docker Tag | PHP Version | Nginx Version | Alpine Version | Container Scripts | Notes | +|-----|-------|-----|--------|--------|----------| +| 4.0.0 | 8.3.0 |1.24-r6 | 3.18 | 0.3.17 | upgrade to php 8.3.0 | + #### PHP 8.2.x | Docker Tag | PHP Version | Nginx Version | Alpine Version | Container Scripts | Notes | From 0cf816bf363b4b39cdb38810c6dfdac425389505 Mon Sep 17 00:00:00 2001 From: Ievgenii Kovtun Date: Thu, 14 Dec 2023 22:17:39 +0100 Subject: [PATCH 2/5] upgrade to php 8.3.0 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 88f76c29..41d2e254 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ If you have improvements or suggestions please open an issue or pull request on ### Versioning | Docker Tag | Git Release | Nginx Version | PHP Version | Alpine Version | |-----|-------|-----|--------|--------| -| latest/![docker version](https://img.shields.io/docker/v/richarvey/nginx-php-fpm?sort=semver)| Main Branch |1.24-r6 | 8.2.7 | 3.18 | +| latest/![docker version](https://img.shields.io/docker/v/richarvey/nginx-php-fpm?sort=semver)| Main Branch |1.24-r6 | 8.3.0 | 3.18 | For other tags please see: [versioning](https://github.com/richarvey/nginx-php-fpm/blob/main/docs/versioning.md) From 027ad7d5f313669506c4709957494f32c33986d0 Mon Sep 17 00:00:00 2001 From: Ievgenii Kovtun Date: Thu, 21 Dec 2023 21:40:22 +0100 Subject: [PATCH 3/5] Xdebug enables in start.sh by settih up ENABLE_XDEBUG=1 --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index cd6473ef..80aec382 100644 --- a/Dockerfile +++ b/Dockerfile @@ -76,7 +76,6 @@ RUN apk add --no-cache --virtual .sys-deps \ pecl install -o -f mongodb && \ echo "extension=redis.so" > /usr/local/etc/php/conf.d/redis.ini && \ echo "extension=mongodb.so" > /usr/local/etc/php/conf.d/mongodb.ini && \ - echo "zend_extension=xdebug" > /usr/local/etc/php/conf.d/xdebug.ini && \ docker-php-source delete && \ mkdir -p /var/www/app && \ # Install composer and certbot From 80fd2173ef7ef47ef57674ad37d85e82f6d6bc5c Mon Sep 17 00:00:00 2001 From: Ievgenii Kovtun Date: Thu, 21 Dec 2023 22:14:25 +0100 Subject: [PATCH 4/5] xdebug.start_with_request=yes conflicts with xdebug.remote_autostart=false --- scripts/start.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/start.sh b/scripts/start.sh index d07be48c..48e0b8b9 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -174,7 +174,6 @@ if [[ "$ENABLE_XDEBUG" == "1" ]] ; then echo "Xdebug already enabled... skipping" else echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > $XdebugFile # Note, single arrow to overwrite file. - echo "xdebug.start_with_request=yes" >> $XdebugFile echo "xdebug.client_host=host.docker.internal" >> $XdebugFile echo "xdebug.mode=debug" >> $XdebugFile echo "xdebug.remote_log=/tmp/xdebug.log" >> $XdebugFile From d32a2312a94d07ec5d30e733b783129a6f1708e1 Mon Sep 17 00:00:00 2001 From: Ievgenii Kovtun Date: Thu, 21 Dec 2023 22:18:58 +0100 Subject: [PATCH 5/5] xdebug.remote_log is deprecated. xdebug.remote_autostart is deprecated, default behaviour with xdebug.start_with_request = default is ok --- scripts/start.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/start.sh b/scripts/start.sh index 48e0b8b9..7a44c228 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -176,8 +176,7 @@ if [[ "$ENABLE_XDEBUG" == "1" ]] ; then echo "zend_extension=$(find /usr/local/lib/php/extensions/ -name xdebug.so)" > $XdebugFile # Note, single arrow to overwrite file. echo "xdebug.client_host=host.docker.internal" >> $XdebugFile echo "xdebug.mode=debug" >> $XdebugFile - echo "xdebug.remote_log=/tmp/xdebug.log" >> $XdebugFile - echo "xdebug.remote_autostart=false " >> $XdebugFile # I use the xdebug chrome extension instead of using autostart + echo "xdebug.log=/tmp/xdebug.log" >> $XdebugFile # NOTE: xdebug.remote_host is not needed here if you set an environment variable in docker-compose like so `- XDEBUG_CONFIG=remote_host=192.168.111.27`. # you also need to set an env var `- PHP_IDE_CONFIG=serverName=docker` fi