Merge pull request #75 from linuxserver/3.19

Rebase to Alpine 3.19
This commit is contained in:
Eric Nemchik 2024-01-24 20:21:38 -06:00 committed by GitHub
commit 72c7bf8f76
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 37 additions and 39 deletions

View file

@ -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/*

View file

@ -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/*

View file

@ -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." }

View file

@ -0,0 +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