diff --git a/.editorconfig b/.editorconfig old mode 100755 new mode 100644 diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md old mode 100755 new mode 100644 diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml old mode 100755 new mode 100644 diff --git a/Dockerfile b/Dockerfile index 71f6feb..1f121de 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22 # set version label ARG BUILD_DATE @@ -18,24 +18,28 @@ RUN \ imagemagick-heic \ libjpeg-turbo-utils \ mediainfo \ - php83-apcu \ - php83-cgi \ - php83-ctype \ - php83-curl \ - php83-dom \ - php83-exif \ - php83-gd \ - php83-ldap \ - php83-mysqli \ - php83-mysqlnd \ - php83-pear \ - php83-pecl-imagick \ - php83-xsl \ - php83-zip \ + php84-apcu \ + php84-cgi \ + php84-ctype \ + php84-curl \ + php84-dom \ + php84-exif \ + php84-gd \ + php84-ldap \ + php84-mysqli \ + php84-mysqlnd \ + php84-pear \ + php84-pecl-imagick \ + php84-xsl \ + php84-zip \ poppler-utils \ re2c && \ echo "**** modify php-fpm process limits ****" && \ - sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php83/php-fpm.d/www.conf && \ + sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php84/php-fpm.d/www.conf && \ + 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 && \ echo "**** download piwigo ****" && \ if [ -z ${PIWIGO_RELEASE+x} ]; then \ PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 4abd3fb..80e0cf9 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22 # set version label ARG BUILD_DATE @@ -18,24 +18,28 @@ RUN \ imagemagick-heic \ libjpeg-turbo-utils \ mediainfo \ - php83-apcu \ - php83-cgi \ - php83-ctype \ - php83-curl \ - php83-dom \ - php83-exif \ - php83-gd \ - php83-ldap \ - php83-mysqli \ - php83-mysqlnd \ - php83-pear \ - php83-pecl-imagick \ - php83-xsl \ - php83-zip \ + php84-apcu \ + php84-cgi \ + php84-ctype \ + php84-curl \ + php84-dom \ + php84-exif \ + php84-gd \ + php84-ldap \ + php84-mysqli \ + php84-mysqlnd \ + php84-pear \ + php84-pecl-imagick \ + php84-xsl \ + php84-zip \ poppler-utils \ re2c && \ echo "**** modify php-fpm process limits ****" && \ - sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php83/php-fpm.d/www.conf && \ + sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php84/php-fpm.d/www.conf && \ + 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 && \ echo "**** download piwigo ****" && \ if [ -z ${PIWIGO_RELEASE+x} ]; then \ PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \ diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README.md b/README.md index f5e5dbe..c46534c 100644 --- a/README.md +++ b/README.md @@ -279,6 +279,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **27.07.25:** - Rebase to Alpine 3.22. * **31.05.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings. * **07.04.24:** - Increase php workers to fix Android uploading in bulk * **02.03.24:** - Fix HEIC file format support. diff --git a/readme-vars.yml b/readme-vars.yml index a9d5b15..2140d8c 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -88,6 +88,7 @@ init_diagram: | "piwigo:latest" <- Base Images # changelog changelogs: + - {date: "27.07.25:", desc: "Rebase to Alpine 3.22."} - {date: "31.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."} - {date: "07.04.24:", desc: "Increase php workers to fix Android uploading in bulk"} - {date: "02.03.24:", desc: "Fix HEIC file format support."} diff --git a/root/etc/php83/conf.d/piwigo.ini b/root/etc/php84/conf.d/piwigo.ini similarity index 78% rename from root/etc/php83/conf.d/piwigo.ini rename to root/etc/php84/conf.d/piwigo.ini index f1f7e37..c0e06cd 100644 --- a/root/etc/php83/conf.d/piwigo.ini +++ b/root/etc/php84/conf.d/piwigo.ini @@ -1,4 +1,4 @@ -; /etc/php83/conf.d/projectsend.ini +; /etc/php84/conf.d/piwigo.ini ; full path comment above to help visibility when searching for php versions [PHP] upload_max_filesize = 100M