Skip to content

Commit 174b08e

Browse files
committed
Revert to 3.21
1 parent ddbb4a5 commit 174b08e

5 files changed

Lines changed: 41 additions & 39 deletions

File tree

Dockerfile

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.21
44

55
# set version label
66
ARG BUILD_DATE
@@ -18,28 +18,28 @@ RUN \
1818
imagemagick-heic \
1919
libjpeg-turbo-utils \
2020
mediainfo \
21-
php84-apcu \
22-
php84-cgi \
23-
php84-ctype \
24-
php84-curl \
25-
php84-dom \
26-
php84-exif \
27-
php84-gd \
28-
php84-ldap \
29-
php84-mysqli \
30-
php84-mysqlnd \
31-
php84-pear \
32-
php84-pecl-imagick \
33-
php84-xsl \
34-
php84-zip \
21+
php83-apcu \
22+
php83-cgi \
23+
php83-ctype \
24+
php83-curl \
25+
php83-dom \
26+
php83-exif \
27+
php83-gd \
28+
php83-ldap \
29+
php83-mysqli \
30+
php83-mysqlnd \
31+
php83-pear \
32+
php83-pecl-imagick \
33+
php83-xsl \
34+
php83-zip \
3535
poppler-utils \
3636
re2c && \
3737
echo "**** modify php-fpm process limits ****" && \
38-
sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php84/php-fpm.d/www.conf && \
38+
sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php83/php-fpm.d/www.conf && \
3939
echo "**** configure php-fpm to pass env vars ****" && \
40-
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
41-
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 && \
42-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
40+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
41+
if ! grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf; fi && \
42+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
4343
echo "**** download piwigo ****" && \
4444
if [ -z ${PIWIGO_RELEASE+x} ]; then \
4545
PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \

Dockerfile.aarch64

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22
3+
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.21
44

55
# set version label
66
ARG BUILD_DATE
@@ -18,28 +18,28 @@ RUN \
1818
imagemagick-heic \
1919
libjpeg-turbo-utils \
2020
mediainfo \
21-
php84-apcu \
22-
php84-cgi \
23-
php84-ctype \
24-
php84-curl \
25-
php84-dom \
26-
php84-exif \
27-
php84-gd \
28-
php84-ldap \
29-
php84-mysqli \
30-
php84-mysqlnd \
31-
php84-pear \
32-
php84-pecl-imagick \
33-
php84-xsl \
34-
php84-zip \
21+
php83-apcu \
22+
php83-cgi \
23+
php83-ctype \
24+
php83-curl \
25+
php83-dom \
26+
php83-exif \
27+
php83-gd \
28+
php83-ldap \
29+
php83-mysqli \
30+
php83-mysqlnd \
31+
php83-pear \
32+
php83-pecl-imagick \
33+
php83-xsl \
34+
php83-zip \
3535
poppler-utils \
3636
re2c && \
3737
echo "**** modify php-fpm process limits ****" && \
38-
sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php84/php-fpm.d/www.conf && \
38+
sed -i 's/pm.max_children = 5/pm.max_children = 32/' /etc/php83/php-fpm.d/www.conf && \
3939
echo "**** configure php-fpm to pass env vars ****" && \
40-
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
41-
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 && \
42-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
40+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \
41+
if ! grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf; fi && \
42+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \
4343
echo "**** download piwigo ****" && \
4444
if [ -z ${PIWIGO_RELEASE+x} ]; then \
4545
PIWIGO_RELEASE=$(curl -sX GET "https://api.github.com/repos/Piwigo/Piwigo/releases/latest" \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
279279

280280
## Versions
281281

282+
* **05.08.25:** - Revert to Alpine 3.21 due to incorrectly stated upstream support for PHP 8.4.
282283
* **27.07.25:** - Rebase to Alpine 3.22.
283284
* **31.05.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings.
284285
* **07.04.24:** - Increase php workers to fix Android uploading in bulk

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ init_diagram: |
8383
"piwigo:latest" <- Base Images
8484
# changelog
8585
changelogs:
86+
- {date: "05.08.25:", desc: "Revert to Alpine 3.21 due to incorrectly stated upstream support for PHP 8.4."}
8687
- {date: "27.07.25:", desc: "Rebase to Alpine 3.22."}
8788
- {date: "31.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
8889
- {date: "07.04.24:", desc: "Increase php workers to fix Android uploading in bulk"}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
; /etc/php84/conf.d/piwigo.ini
1+
; /etc/php83/conf.d/piwigo.ini
22
; full path comment above to help visibility when searching for php versions
33
[PHP]
44
upload_max_filesize = 100M

0 commit comments

Comments
 (0)