From e91ef373c856cd8328ff3bc3a74008de9f27ad07 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 23 Dec 2023 18:11:11 -0600 Subject: [PATCH 1/2] Rebase to Alpine 3.19 Signed-off-by: Eric Nemchik --- Dockerfile | 34 ++++++++++++++------------------ Dockerfile.aarch64 | 34 ++++++++++++++------------------ readme-vars.yml | 3 ++- root/etc/php83/conf.d/piwigo.ini | 3 +++ 4 files changed, 35 insertions(+), 39 deletions(-) create mode 100644 root/etc/php83/conf.d/piwigo.ini diff --git a/Dockerfile b/Dockerfile index fc806ff..eb51d98 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 @@ -17,20 +17,20 @@ RUN \ imagemagick \ libjpeg-turbo-utils \ mediainfo \ - php82-apcu \ - php82-cgi \ - php82-ctype \ - php82-curl \ - php82-dom \ - php82-exif \ - php82-gd \ - php82-ldap \ - php82-mysqli \ - php82-mysqlnd \ - php82-pear \ - php82-pecl-imagick \ - php82-xsl \ - php82-zip \ + 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 \ poppler-utils \ re2c && \ echo "**** download piwigo ****" && \ @@ -44,10 +44,6 @@ RUN \ "https://piwigo.org/download/dlcounter.php?code=${PIWIGO_RELEASE}" && \ unzip -q /tmp/piwigo.zip -d /tmp && \ mv /tmp/piwigo/* /app/www/public && \ - # The max filesize is 2M by default, which is way to small for most photos - sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php82/php.ini && \ - # The max post size is 8M by default, it must be at least max_filesize - sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php82/php.ini && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 4ad5cec..10057d4 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 @@ -17,20 +17,20 @@ RUN \ imagemagick \ libjpeg-turbo-utils \ mediainfo \ - php82-apcu \ - php82-cgi \ - php82-ctype \ - php82-curl \ - php82-dom \ - php82-exif \ - php82-gd \ - php82-ldap \ - php82-mysqli \ - php82-mysqlnd \ - php82-pear \ - php82-pecl-imagick \ - php82-xsl \ - php82-zip \ + 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 \ poppler-utils \ re2c && \ echo "**** download piwigo ****" && \ @@ -44,10 +44,6 @@ RUN \ "https://piwigo.org/download/dlcounter.php?code=${PIWIGO_RELEASE}" && \ unzip -q /tmp/piwigo.zip -d /tmp && \ mv /tmp/piwigo/* /app/www/public && \ - # The max filesize is 2M by default, which is way to small for most photos - sed -ri 's/^upload_max_filesize = .*/upload_max_filesize = 100M/' /etc/php82/php.ini && \ - # The max post size is 8M by default, it must be at least max_filesize - sed -ri 's/^post_max_size = .*/post_max_size = 100M/' /etc/php82/php.ini && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* diff --git a/readme-vars.yml b/readme-vars.yml index e695e12..c30e452 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -20,7 +20,7 @@ param_env_vars: - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Configuration files." } + - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } - { vol_path: "/gallery", vol_host_path: "/path/to/appdata/gallery", desc: "Image storage for Piwigo" } param_usage_include_ports: true param_ports: @@ -37,6 +37,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} - { date: "12.12.23:", desc: "Rebase to Alpine 3.18." } - { date: "03.06.23:", desc: "Revert to Alpine 3.17 due to compatibility issues with php 8.2." } - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } diff --git a/root/etc/php83/conf.d/piwigo.ini b/root/etc/php83/conf.d/piwigo.ini new file mode 100644 index 0000000..81b91a9 --- /dev/null +++ b/root/etc/php83/conf.d/piwigo.ini @@ -0,0 +1,3 @@ +[PHP] +upload_max_filesize = 100M +post_max_size = 100M From 528557ee621b4b1fe7c61e2ab21a1af52824c17e Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 23 Dec 2023 18:24:08 -0600 Subject: [PATCH 2/2] full path comment above to help visibility when searching for php versions Signed-off-by: Eric Nemchik --- root/etc/php83/conf.d/piwigo.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/root/etc/php83/conf.d/piwigo.ini b/root/etc/php83/conf.d/piwigo.ini index 81b91a9..f1f7e37 100644 --- a/root/etc/php83/conf.d/piwigo.ini +++ b/root/etc/php83/conf.d/piwigo.ini @@ -1,3 +1,5 @@ +; /etc/php83/conf.d/projectsend.ini +; full path comment above to help visibility when searching for php versions [PHP] upload_max_filesize = 100M post_max_size = 100M