From 90612dfacba39c30ebccfd35209f7cabe36d27a8 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Wed, 23 Nov 2022 13:41:06 +0100 Subject: [PATCH] push to alpine 3.17 and php 8.1 --- Dockerfile | 5 ++--- rootfs/etc/confd/conf.d/00_memory_limit.ini.toml | 2 +- rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml | 2 +- rootfs/etc/confd/conf.d/02_opcache.ini.toml | 2 +- rootfs/etc/confd/conf.d/www.conf.toml | 2 +- rootfs/etc/{php8 => php81}/php-fpm.conf | 4 ++-- rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) rename rootfs/etc/{php8 => php81}/php-fpm.conf (98%) diff --git a/Dockerfile b/Dockerfile index 70f76be..7a261c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ -FROM docker.io/thallian/confd-env:3.16 +FROM docker.io/thallian/confd-env:3.17 -RUN apk --no-cache add php8-fpm -RUN ln -s /usr/bin/php8 /usr/bin/php +RUN apk --no-cache add php81-fpm ADD /rootfs / diff --git a/rootfs/etc/confd/conf.d/00_memory_limit.ini.toml b/rootfs/etc/confd/conf.d/00_memory_limit.ini.toml index ec688ba..432c8a8 100644 --- a/rootfs/etc/confd/conf.d/00_memory_limit.ini.toml +++ b/rootfs/etc/confd/conf.d/00_memory_limit.ini.toml @@ -1,3 +1,3 @@ [template] src = "00_memory_limit.ini.tmpl" -dest = "/etc/php8/conf.d/00_memory_limit.ini" +dest = "/etc/php81/conf.d/00_memory_limit.ini" diff --git a/rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml b/rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml index 32e5e52..7d172f5 100644 --- a/rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml +++ b/rootfs/etc/confd/conf.d/01_max_execution_time.ini.toml @@ -1,3 +1,3 @@ [template] src = "01_max_execution_time.ini.tmpl" -dest = "/etc/php8/conf.d/01_max_execution_time.ini" +dest = "/etc/php81/conf.d/01_max_execution_time.ini" diff --git a/rootfs/etc/confd/conf.d/02_opcache.ini.toml b/rootfs/etc/confd/conf.d/02_opcache.ini.toml index f51cc55..e007241 100644 --- a/rootfs/etc/confd/conf.d/02_opcache.ini.toml +++ b/rootfs/etc/confd/conf.d/02_opcache.ini.toml @@ -1,3 +1,3 @@ [template] src = "02_opcache.ini.tmpl" -dest = "/etc/php8/conf.d/02_opcache.ini" +dest = "/etc/php81/conf.d/02_opcache.ini" diff --git a/rootfs/etc/confd/conf.d/www.conf.toml b/rootfs/etc/confd/conf.d/www.conf.toml index 770c784..24302ca 100644 --- a/rootfs/etc/confd/conf.d/www.conf.toml +++ b/rootfs/etc/confd/conf.d/www.conf.toml @@ -1,3 +1,3 @@ [template] src = "www.conf.tmpl" -dest = "/etc/php8/php-fpm.d/www.conf" +dest = "/etc/php81/php-fpm.d/www.conf" diff --git a/rootfs/etc/php8/php-fpm.conf b/rootfs/etc/php81/php-fpm.conf similarity index 98% rename from rootfs/etc/php8/php-fpm.conf rename to rootfs/etc/php81/php-fpm.conf index fdd7898..29781e4 100644 --- a/rootfs/etc/php8/php-fpm.conf +++ b/rootfs/etc/php81/php-fpm.conf @@ -14,7 +14,7 @@ ; Pid file ; Note: the default prefix is /var ; Default Value: none -;pid = run/php-fpm7.pid +;pid = run/php81-fpm.pid ; Error log file ; If it's set to "syslog", log is sent to syslogd instead of being written @@ -122,4 +122,4 @@ error_log = syslog ; Relative path can also be used. They will be prefixed by: ; - the global prefix if it's been set (-p argument) ; - /usr otherwise -include=/etc/php8/php-fpm.d/*.conf +include=/etc/php81/php-fpm.d/*.conf diff --git a/rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run b/rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run index 0dc8f7e..6f6ef31 100644 --- a/rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run +++ b/rootfs/etc/s6-overlay/s6-rc.d/php8-fpm/run @@ -1,3 +1,3 @@ #!/bin/sh -exec php-fpm8 --nodaemonize --force-stderr +exec php-fpm81 --nodaemonize --force-stderr