diff --git a/Dockerfile b/Dockerfile index 5a75d1e0..80aec382 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 " @@ -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 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) 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 | diff --git a/scripts/start.sh b/scripts/start.sh index d07be48c..7a44c228 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -174,11 +174,9 @@ 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 - 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