diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 8459cc3..0db551e 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -12,28 +12,28 @@ RUN dnf install -y --nobest \ langpacks-de \ libatomic \ nmap-ncat \ - php85-php-ast \ - php85-php-bcmath \ - php85-php-cli \ - php85-php-devel \ - php85-php-fpm \ - php85-php-gd \ - php85-php-intl \ - php85-php-mbstring \ - php85-php-opcache \ - php85-php-pecl-amqp \ - php85-php-pecl-apcu \ - php85-php-pecl-memcached \ - php85-php-pecl-mongodb2 \ - php85-php-pecl-pcov \ - php85-php-pecl-rdkafka6 \ - php85-php-pecl-redis \ - php85-php-pecl-swoole6 \ - php85-php-pecl-xdebug3 \ - php85-php-pecl-zip \ - php85-php-pgsql \ - php85-php-sodium \ - php85-php-xml \ + php86-php-ast \ + php86-php-bcmath \ + php86-php-cli \ + php86-php-devel \ + php86-php-fpm \ + php86-php-gd \ + php86-php-intl \ + php86-php-mbstring \ + php86-php-opcache \ + php86-php-pecl-amqp \ + php86-php-pecl-apcu \ + php86-php-pecl-memcached \ + php86-php-pecl-mongodb2 \ + php86-php-pecl-pcov \ + #php86-php-pecl-rdkafka6 \ + php86-php-pecl-redis \ + #php86-php-pecl-swoole6 \ + php86-php-pecl-xdebug3 \ + php86-php-pecl-zip \ + php86-php-pgsql \ + php86-php-sodium \ + php86-php-xml \ procps-ng \ sudo \ supervisor \ @@ -41,9 +41,9 @@ RUN dnf install -y --nobest \ vim \ zsh -RUN ln -sf /usr/bin/php85 /usr/bin/php \ - && rm /etc/opt/remi/php85/php.d/15-xdebug.ini \ - && rm /etc/opt/remi/php85/php.d/40-pcov.ini +RUN ln -sf /usr/bin/php86 /usr/bin/php \ + && rm /etc/opt/remi/php86/php.d/15-xdebug.ini \ + && rm /etc/opt/remi/php86/php.d/40-pcov.ini ENV TZ=Europe/Zurich diff --git a/docker/php/files/etc/opt/remi/php85/php-fpm.conf b/docker/php/files/etc/opt/remi/php86/php-fpm.conf similarity index 100% rename from docker/php/files/etc/opt/remi/php85/php-fpm.conf rename to docker/php/files/etc/opt/remi/php86/php-fpm.conf diff --git a/docker/php/files/etc/opt/remi/php85/php.ini b/docker/php/files/etc/opt/remi/php86/php.ini similarity index 100% rename from docker/php/files/etc/opt/remi/php85/php.ini rename to docker/php/files/etc/opt/remi/php86/php.ini diff --git a/docker/php/files/etc/supervisord.conf b/docker/php/files/etc/supervisord.conf index 6219fe4..98ee047 100644 --- a/docker/php/files/etc/supervisord.conf +++ b/docker/php/files/etc/supervisord.conf @@ -15,7 +15,7 @@ supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface serverurl=unix:///tmp/supervisor.sock [program:php-fpm] -command=/opt/remi/php85/root/usr/sbin/php-fpm -c /etc/opt/remi/php85/php-fpm.conf -F +command=/opt/remi/php86/root/usr/sbin/php-fpm -c /etc/opt/remi/php86/php-fpm.conf -F stdout_logfile=/tmp/supervisord.log stdout_syslog=true stderr_logfile=/tmp/supervisord.log diff --git a/docker/php/files/home/php/.sharedrc b/docker/php/files/home/php/.sharedrc index ad84194..01a6aa7 100644 --- a/docker/php/files/home/php/.sharedrc +++ b/docker/php/files/home/php/.sharedrc @@ -18,10 +18,10 @@ alias rm='rm -i' alias php-fpm-restart='/usr/bin/supervisorctl -c /etc/supervisord.conf restart php-fpm' -alias xdebug-on='echo "zend_extension=xdebug.so" | sudo tee /etc/opt/remi/php85/php.d/15-xdebug.ini && php-fpm-restart' -alias xdebug-off='sudo rm /etc/opt/remi/php85/php.d/15-xdebug.ini && php-fpm-restart' -alias pcov-on='echo "extension=pcov.so" | sudo tee /etc/opt/remi/php85/php.d/40-pcov.ini && php-fpm-restart' -alias pcov-off='sudo rm /etc/opt/remi/php85/php.d/40-pcov.ini && php-fpm-restart' +alias xdebug-on='echo "zend_extension=xdebug.so" | sudo tee /etc/opt/remi/php86/php.d/15-xdebug.ini && php-fpm-restart' +alias xdebug-off='sudo rm /etc/opt/remi/php86/php.d/15-xdebug.ini && php-fpm-restart' +alias pcov-on='echo "extension=pcov.so" | sudo tee /etc/opt/remi/php86/php.d/40-pcov.ini && php-fpm-restart' +alias pcov-off='sudo rm /etc/opt/remi/php86/php.d/40-pcov.ini && php-fpm-restart' # Reset per-harness state to the image baseline, keeping only what docker-compose.yml bind-mounts # (plus, for pi, the packages baked into the image by the Dockerfile).