From 80caf4a51a00b4cb9656aa6ef37f6206fc0fad83 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Thu, 21 Dec 2023 20:20:29 +0000 Subject: [PATCH 1/2] Rebase to Alpine 3.19 with php 8.3 Signed-off-by: GitHub --- Dockerfile | 28 ++++++++++++++-------------- Dockerfile.aarch64 | 28 ++++++++++++++-------------- readme-vars.yml | 1 + 3 files changed, 29 insertions(+), 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index 97cfdb7..b796a92 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19 # set version label ARG BUILD_DATE @@ -21,17 +21,17 @@ RUN \ gpg-agent \ gnupg-dirmngr && \ apk add --no-cache \ - php82-bz2 \ - php82-dom \ - php82-gd \ - php82-mysqli \ - php82-opcache \ - php82-pecl-uploadprogress \ - php82-tokenizer && \ + php83-bz2 \ + php83-dom \ + php83-gd \ + php83-mysqli \ + php83-opcache \ + php83-pecl-uploadprogress \ + php83-tokenizer && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php82/php-fpm.conf && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \ + grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \ echo "**** setup php opcache ****" && \ { \ echo 'opcache.memory_consumption=128'; \ @@ -39,12 +39,12 @@ RUN \ echo 'opcache.max_accelerated_files=4000'; \ echo 'opcache.revalidate_freq=2'; \ echo 'opcache.fast_shutdown=1'; \ - } > /etc/php82/conf.d/opcache-recommended.ini; \ + } > /etc/php83/conf.d/opcache-recommended.ini; \ \ { \ echo 'session.cookie_httponly=1'; \ echo 'session.use_strict_mode=1'; \ - } > /etc/php82/conf.d/session-strict.ini; \ + } > /etc/php83/conf.d/session-strict.ini; \ \ { \ echo 'allow_url_fopen=Off'; \ @@ -53,7 +53,7 @@ RUN \ echo 'memory_limit=${MEMORY_LIMIT}'; \ echo 'post_max_size=${UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \ - } > /etc/php82/conf.d/phpmyadmin-misc.ini && \ + } > /etc/php83/conf.d/phpmyadmin-misc.ini && \ echo "**** install phpmyadmin ****" && \ mkdir -p /app/www/public && \ if [ -z ${PHPMYADMIN_VERSION+x} ]; then \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2fc525e..5700939 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19 # set version label ARG BUILD_DATE @@ -21,17 +21,17 @@ RUN \ gpg-agent \ gnupg-dirmngr && \ apk add --no-cache \ - php82-bz2 \ - php82-dom \ - php82-gd \ - php82-mysqli \ - php82-opcache \ - php82-pecl-uploadprogress \ - php82-tokenizer && \ + php83-bz2 \ + php83-dom \ + php83-gd \ + php83-mysqli \ + php83-opcache \ + php83-pecl-uploadprogress \ + php83-tokenizer && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php82/php-fpm.conf && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \ + grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \ echo "**** setup php opcache ****" && \ { \ echo 'opcache.memory_consumption=128'; \ @@ -39,12 +39,12 @@ RUN \ echo 'opcache.max_accelerated_files=4000'; \ echo 'opcache.revalidate_freq=2'; \ echo 'opcache.fast_shutdown=1'; \ - } > /etc/php82/conf.d/opcache-recommended.ini; \ + } > /etc/php83/conf.d/opcache-recommended.ini; \ \ { \ echo 'session.cookie_httponly=1'; \ echo 'session.use_strict_mode=1'; \ - } > /etc/php82/conf.d/session-strict.ini; \ + } > /etc/php83/conf.d/session-strict.ini; \ \ { \ echo 'allow_url_fopen=Off'; \ @@ -53,7 +53,7 @@ RUN \ echo 'memory_limit=${MEMORY_LIMIT}'; \ echo 'post_max_size=${UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \ - } > /etc/php82/conf.d/phpmyadmin-misc.ini && \ + } > /etc/php83/conf.d/phpmyadmin-misc.ini && \ echo "**** install phpmyadmin ****" && \ mkdir -p /app/www/public && \ if [ -z ${PHPMYADMIN_VERSION+x} ]; then \ diff --git a/readme-vars.yml b/readme-vars.yml index 80ee096..232893c 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -46,6 +46,7 @@ app_setup_block: | # changelog changelogs: + - { date: "21.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3." } - { date: "06.09.23:", desc: "Add support for custom themes." } - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." } From e730103ed8527d0a8e614edf758adef62b225186 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 23 Dec 2023 16:15:02 -0600 Subject: [PATCH 2/2] Readme adjustment Signed-off-by: Eric Nemchik --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 232893c..3466aaa 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -33,7 +33,7 @@ param_ports: param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Contains all relevant configuration files." } + - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } # application setup block app_setup_block_enabled: true