From b6cc89978c511a0eb30ef22e3730a47ab09cd442 Mon Sep 17 00:00:00 2001 From: Nigel Banks Date: Fri, 29 Mar 2024 02:43:41 +0100 Subject: [PATCH] wip --- code-server/Dockerfile | 2 +- .../rootfs/etc/s6-overlay/s6-rc.d/xdebug/run | 2 +- docker-bake.hcl | 6 +- nginx/Dockerfile | 58 +++++++++---------- .../rootfs/etc/confd/conf.d/php-fpm.conf.toml | 2 +- nginx/rootfs/etc/confd/conf.d/php.ini.toml | 2 +- nginx/rootfs/etc/confd/conf.d/www.conf.toml | 2 +- .../etc/confd/templates/php-fpm.conf.tmpl | 4 +- nginx/rootfs/etc/confd/templates/php.ini.tmpl | 2 +- .../rootfs/etc/confd/templates/www.conf.tmpl | 10 ++-- nginx/rootfs/etc/s6-overlay/s6-rc.d/fpm/run | 2 +- riprap/Dockerfile | 2 +- 12 files changed, 47 insertions(+), 47 deletions(-) diff --git a/code-server/Dockerfile b/code-server/Dockerfile index 0247de0e..6a2b59d3 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -29,7 +29,7 @@ RUN --mount=type=cache,id=code-server-apk-${TARGETARCH},sharing=locked,target=/v nodejs \ openssh \ parallel \ - php82-pecl-xdebug \ + php83-pecl-xdebug \ python3 \ spdlog \ sudo \ diff --git a/code-server/rootfs/etc/s6-overlay/s6-rc.d/xdebug/run b/code-server/rootfs/etc/s6-overlay/s6-rc.d/xdebug/run index 98ff21f9..6dff2106 100755 --- a/code-server/rootfs/etc/s6-overlay/s6-rc.d/xdebug/run +++ b/code-server/rootfs/etc/s6-overlay/s6-rc.d/xdebug/run @@ -8,7 +8,7 @@ XDEBUG_FLAGS=$( # - - alpine = "docker-image://alpine:3.18.4@sha256:eece025e432126ce23f223450a0326fbebde39cdf496a85d8c016293fc851978" + alpine = "docker-image://alpine:3.19.1@sha256:c5b1261d6d3e43071626931fc004f70149baeba2c8ec672bd4f27761f8e1ad6b" } } @@ -357,7 +357,7 @@ target "houdini-common" { context = "houdini" contexts = { # Produced by this repository . - imagemagick = "docker-image://islandora/imagemagick:alpine-3.18.4-imagemagick-7.1.1.23-r0@sha256:7d1fa5d76a5c640bf109e2c3c0bea890f7290da15b8bce6dc17e5a111443b38f" + imagemagick = "docker-image://islandora/imagemagick:alpine-3.19.1-imagemagick-7.1.1.26-r0@sha256:82db5dc45ea392f9797d3ce7471d9c578589e8ee9725f84abdf281e27660be6e" } } @@ -366,7 +366,7 @@ target "hypercube-common" { context = "hypercube" contexts = { # Produced by this repository . - leptonica = "docker-image://islandora/leptonica:alpine-3.18.4-leptonica-1.83.1-r0@sha256:d197e51eb68aa5ae802b07e4e30cb82abd24c022651fd67e1daca47409cbe812" + leptonica = "docker-image://islandora/leptonica:alpine-3.19.1-leptonica-1.83.1-r0@sha256:265add7dd91404bf68ddc4836a945f7d810bbbd780959854f299b2419401e158" } } diff --git a/nginx/Dockerfile b/nginx/Dockerfile index bafd105f..84510071 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -25,36 +25,36 @@ RUN --mount=type=cache,id=nginx-apk-${TARGETARCH},sharing=locked,target=/var/cac apk add \ icu-data-full \ nginx \ - php82 \ - php82-ctype \ - php82-curl \ - php82-dom \ - php82-fileinfo \ - php82-fpm \ - php82-gd \ - php82-iconv \ - php82-intl \ - php82-json \ - php82-ldap \ - php82-mbstring \ - php82-mysqli \ - php82-opcache \ - php82-openssl \ - php82-pdo \ - php82-pdo_mysql \ - php82-pdo_pgsql \ - php82-phar \ - php82-session \ - php82-simplexml \ - php82-sockets \ - php82-tokenizer \ - php82-xml \ - php82-xmlreader \ - php82-xmlwriter \ - php82-xsl \ - php82-zip \ + php83 \ + php83-ctype \ + php83-curl \ + php83-dom \ + php83-fileinfo \ + php83-fpm \ + php83-gd \ + php83-iconv \ + php83-intl \ + php83-json \ + php83-ldap \ + php83-mbstring \ + php83-mysqli \ + php83-opcache \ + php83-openssl \ + php83-pdo \ + php83-pdo_mysql \ + php83-pdo_pgsql \ + php83-phar \ + php83-session \ + php83-simplexml \ + php83-sockets \ + php83-tokenizer \ + php83-xml \ + php83-xmlreader \ + php83-xmlwriter \ + php83-xsl \ + php83-zip \ && \ - ln -s /usr/bin/php82 /usr/bin/php && \ + ln -s /usr/bin/php83 /usr/bin/php && \ addgroup nginx jwt && \ cleanup.sh diff --git a/nginx/rootfs/etc/confd/conf.d/php-fpm.conf.toml b/nginx/rootfs/etc/confd/conf.d/php-fpm.conf.toml index e570655c..0721dceb 100644 --- a/nginx/rootfs/etc/confd/conf.d/php-fpm.conf.toml +++ b/nginx/rootfs/etc/confd/conf.d/php-fpm.conf.toml @@ -1,6 +1,6 @@ [template] src = "php-fpm.conf.tmpl" -dest = "/etc/php82/php-fpm.conf" +dest = "/etc/php83/php-fpm.conf" uid = 0 gid = 0 mode = "0644" diff --git a/nginx/rootfs/etc/confd/conf.d/php.ini.toml b/nginx/rootfs/etc/confd/conf.d/php.ini.toml index e3adf1f8..beff4fa8 100644 --- a/nginx/rootfs/etc/confd/conf.d/php.ini.toml +++ b/nginx/rootfs/etc/confd/conf.d/php.ini.toml @@ -1,6 +1,6 @@ [template] src = "php.ini.tmpl" -dest = "/etc/php82/php.ini" +dest = "/etc/php83/php.ini" uid = 0 gid = 0 mode = "0644" diff --git a/nginx/rootfs/etc/confd/conf.d/www.conf.toml b/nginx/rootfs/etc/confd/conf.d/www.conf.toml index e0e7060c..9bde046e 100644 --- a/nginx/rootfs/etc/confd/conf.d/www.conf.toml +++ b/nginx/rootfs/etc/confd/conf.d/www.conf.toml @@ -1,6 +1,6 @@ [template] src = "www.conf.tmpl" -dest = "/etc/php82/php-fpm.d/www.conf" +dest = "/etc/php83/php-fpm.d/www.conf" uid = 0 gid = 0 mode = "0644" diff --git a/nginx/rootfs/etc/confd/templates/php-fpm.conf.tmpl b/nginx/rootfs/etc/confd/templates/php-fpm.conf.tmpl index ebbc13ed..4f07393b 100644 --- a/nginx/rootfs/etc/confd/templates/php-fpm.conf.tmpl +++ b/nginx/rootfs/etc/confd/templates/php-fpm.conf.tmpl @@ -20,7 +20,7 @@ ; If it's set to "syslog", log is sent to syslogd instead of being written ; into a local file. ; Note: the default prefix is /var -; Default Value: log/php82/error.log +; Default Value: log/php83/error.log error_log = /dev/stderr ; syslog_facility is used to specify what type of program is logging the @@ -140,4 +140,4 @@ daemonize = no ; 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/php82/php-fpm.d/*.conf +include=/etc/php83/php-fpm.d/*.conf diff --git a/nginx/rootfs/etc/confd/templates/php.ini.tmpl b/nginx/rootfs/etc/confd/templates/php.ini.tmpl index 52f1f32b..0b05b202 100644 --- a/nginx/rootfs/etc/confd/templates/php.ini.tmpl +++ b/nginx/rootfs/etc/confd/templates/php.ini.tmpl @@ -732,7 +732,7 @@ default_charset = "UTF-8" ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" -include_path = ".:/usr/share/php82" +include_path = ".:/usr/share/php83" ; ; Windows: "\path1;\path2" ;include_path = ".;c:\php\includes" diff --git a/nginx/rootfs/etc/confd/templates/www.conf.tmpl b/nginx/rootfs/etc/confd/templates/www.conf.tmpl index a1e8eaf9..61d4c29f 100644 --- a/nginx/rootfs/etc/confd/templates/www.conf.tmpl +++ b/nginx/rootfs/etc/confd/templates/www.conf.tmpl @@ -229,7 +229,7 @@ pm.max_spare_servers = 3 ; last request memory: 0 ; ; Note: There is a real-time FPM status monitoring sample web page available -; It's available in: /usr/share/php82/fpm/status.html +; It's available in: /usr/share/php83/fpm/status.html ; ; Note: The value must start with a leading slash (/). The value can be ; anything, but it may not be a good idea to use the .php extension or it @@ -256,7 +256,7 @@ pm.status_path = /status ; The access log file ; Default: not set -;access.log = log/php82/$pool.access.log +;access.log = log/php83/$pool.access.log ; The access log format. ; The following syntax is allowed @@ -320,7 +320,7 @@ pm.status_path = /status ; The log file for slow requests ; Default Value: not set ; Note: slowlog is mandatory if request_slowlog_timeout is set -;slowlog = log/php82/$pool.slow.log +;slowlog = log/php83/$pool.slow.log ; The timeout for serving a single request after which a PHP backtrace will be ; dumped to the 'slowlog' file. A value of '0s' means 'off'. @@ -401,7 +401,7 @@ clear_env = yes ; execute php code. ; Note: set an empty value to allow all extensions. ; Default Value: .php -;security.limit_extensions = .php .php3 .php4 .php5 .php82 +;security.limit_extensions = .php .php3 .php4 .php5 .php83 ; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from ; the current environment. @@ -433,6 +433,6 @@ clear_env = yes ; specified at startup with the -d argument ;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com ;php_flag[display_errors] = off -;php_admin_value[error_log] = /var/log/php82/$pool.error.log +;php_admin_value[error_log] = /var/log/php83/$pool.error.log ;php_admin_flag[log_errors] = on ;php_admin_value[memory_limit] = 32M diff --git a/nginx/rootfs/etc/s6-overlay/s6-rc.d/fpm/run b/nginx/rootfs/etc/s6-overlay/s6-rc.d/fpm/run index ffb5882b..a65a7755 100755 --- a/nginx/rootfs/etc/s6-overlay/s6-rc.d/fpm/run +++ b/nginx/rootfs/etc/s6-overlay/s6-rc.d/fpm/run @@ -3,4 +3,4 @@ set -e exec s6-notifyoncheck -d -t 30000 -n 1 /usr/sbin/php-fpm82 \ --pid /var/run/php-fpm82/php-fpm82.pid \ --prefix /var/run/php-fpm82 \ - --fpm-config /etc/php82/php-fpm.conf + --fpm-config /etc/php83/php-fpm.conf diff --git a/riprap/Dockerfile b/riprap/Dockerfile index e77a8e64..b6161626 100644 --- a/riprap/Dockerfile +++ b/riprap/Dockerfile @@ -13,7 +13,7 @@ WORKDIR /var/www/riprap # Platform specific does require arch specific identifier. RUN --mount=type=cache,id=riprap-apk-${TARGETARCH},sharing=locked,target=/var/cache/apk \ - apk add php82-pdo_sqlite && \ + apk add php83-pdo_sqlite && \ cleanup.sh # Platform agnostic does not require arch specific identifier.