diff --git a/Dockerfile b/Dockerfile index 390d919..a32b22a 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 @@ -22,22 +22,22 @@ RUN \ grep \ imagemagick \ jpegoptim \ - php82-bcmath \ - php82-dom \ - php82-exif \ - php82-gd \ - php82-intl \ - php82-pdo_mysql \ - php82-pdo_pgsql \ - php82-pdo_sqlite \ - php82-pecl-imagick \ - php82-pecl-redis \ - php82-sqlite3 \ - php82-tokenizer \ + php83-bcmath \ + php83-dom \ + php83-exif \ + php83-gd \ + php83-intl \ + php83-pdo_mysql \ + php83-pdo_pgsql \ + php83-pdo_sqlite \ + php83-pecl-imagick \ + php83-pecl-redis \ + php83-sqlite3 \ + php83-tokenizer \ postgresql15-client && \ 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 && \ + 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 "**** install lychee ****" && \ if [ -z "${LYCHEE_VERSION}" ]; then \ LYCHEE_VERSION=$(curl -sX GET "https://api.github.com/repos/LycheeOrg/Lychee/releases/latest" \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index fa9cf29..4adf9bf 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 @@ -22,22 +22,22 @@ RUN \ grep \ imagemagick \ jpegoptim \ - php82-bcmath \ - php82-dom \ - php82-exif \ - php82-gd \ - php82-intl \ - php82-pdo_mysql \ - php82-pdo_pgsql \ - php82-pdo_sqlite \ - php82-pecl-imagick \ - php82-pecl-redis \ - php82-sqlite3 \ - php82-tokenizer \ + php83-bcmath \ + php83-dom \ + php83-exif \ + php83-gd \ + php83-intl \ + php83-pdo_mysql \ + php83-pdo_pgsql \ + php83-pdo_sqlite \ + php83-pecl-imagick \ + php83-pecl-redis \ + php83-sqlite3 \ + php83-tokenizer \ postgresql15-client && \ 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 && \ + 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 "**** install lychee ****" && \ if [ -z "${LYCHEE_VERSION}" ]; then \ LYCHEE_VERSION=$(curl -sX GET "https://api.github.com/repos/LycheeOrg/Lychee/releases/latest" \ diff --git a/readme-vars.yml b/readme-vars.yml index f540e37..ad44038 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -67,6 +67,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.01.24:", desc: "Rebase to Alpine 3.19 with php 8.3."} - { date: "27.12.23:", desc: "Update image to support v5." } - { date: "25.12.23:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf. Build npm dependencies into image." } - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run b/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run index 046d3c7..4c55964 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run @@ -30,8 +30,8 @@ if [[ ! -L /app/www/storage/logs ]]; then fi cp -n /defaults/user.ini /config/user.ini 2> >(grep -v 'cp: not replacing') -rm -rf /etc/php82/conf.d/99-user.ini -ln -s /config/user.ini /etc/php82/conf.d/99-user.ini +rm -rf /etc/php83/conf.d/99-user.ini +ln -s /config/user.ini /etc/php83/conf.d/99-user.ini cd /app/www || exit 1