diff --git a/Dockerfile b/Dockerfile index 7b9ce78..dc1a1a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.24 # set version label ARG BUILD_DATE @@ -13,16 +13,16 @@ RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ icu-data-full \ - php84-dom \ - php84-gd \ - php84-intl \ - php84-pdo_sqlite \ - php84-sqlite3 \ - php84-tokenizer && \ + php85-dom \ + php85-gd \ + php85-intl \ + php85-pdo_sqlite \ + php85-sqlite3 \ + php85-tokenizer && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \ - if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \ + if ! grep -qxF 'clear_env = no' /etc/php85/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php85/php-fpm.d/www.conf; fi && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php85/php-fpm.conf && \ echo "**** install cops ****" && \ if [ -z ${COPS_RELEASE+x} ]; then \ COPS_RELEASE=$(curl -sX GET "https://api.github.com/repos/mikespub-org/seblucas-cops/releases/latest" \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index d4d117b..ae73e14 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.24 # set version label ARG BUILD_DATE @@ -13,16 +13,16 @@ RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache --upgrade \ icu-data-full \ - php84-dom \ - php84-gd \ - php84-intl \ - php84-pdo_sqlite \ - php84-sqlite3 \ - php84-tokenizer && \ + php85-dom \ + php85-gd \ + php85-intl \ + php85-pdo_sqlite \ + php85-sqlite3 \ + php85-tokenizer && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \ - if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \ + if ! grep -qxF 'clear_env = no' /etc/php85/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php85/php-fpm.d/www.conf; fi && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php85/php-fpm.conf && \ echo "**** install cops ****" && \ if [ -z ${COPS_RELEASE+x} ]; then \ COPS_RELEASE=$(curl -sX GET "https://api.github.com/repos/mikespub-org/seblucas-cops/releases/latest" \ diff --git a/README.md b/README.md index d1c938e..1e81479 100644 --- a/README.md +++ b/README.md @@ -311,6 +311,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **21.07.26:** - Rebase to Alpine 3.24. * **10.06.26:** - Existing users should verify: site-confs/default.conf and config/local.php - Update redirect location and use front controller. * **08.02.26:** - Existing users should update: site-confs/default.conf - Deny access to all dotfiles. * **08.02.26:** - Adding missing php-tokenizer package. diff --git a/readme-vars.yml b/readme-vars.yml index 6ec39ba..5a71374 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -114,6 +114,7 @@ init_diagram: | "cops:latest" <- Base Images # changelog changelogs: + - {date: "21.07.26:", desc: "Rebase to Alpine 3.24."} - {date: "10.06.26:", desc: "Existing users should verify: site-confs/default.conf and config/local.php - Update redirect location and use front controller."} - {date: "08.02.26:", desc: "Existing users should update: site-confs/default.conf - Deny access to all dotfiles."} - {date: "08.02.26:", desc: "Adding missing php-tokenizer package."}