Skip to content

Commit 8ac2e21

Browse files
committed
Rebase to 3.23
1 parent 4659e00 commit 8ac2e21

4 files changed

Lines changed: 28 additions & 28 deletions

File tree

Dockerfile

Lines changed: 13 additions & 14 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.23
44

55
# set version label
66
ARG BUILD_DATE
@@ -21,30 +21,29 @@ RUN \
2121
gpg-agent \
2222
gnupg-dirmngr && \
2323
apk add --no-cache \
24-
php84-bz2 \
25-
php84-dom \
26-
php84-gd \
27-
php84-mysqli \
28-
php84-opcache \
29-
php84-pecl-uploadprogress \
30-
php84-tokenizer && \
24+
php85-bz2 \
25+
php85-dom \
26+
php85-gd \
27+
php85-mysqli \
28+
php85-pecl-uploadprogress \
29+
php85-tokenizer && \
3130
echo "**** configure php-fpm to pass env vars ****" && \
32-
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
33-
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 && \
34-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
31+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \
32+
if ! grep -qxF 'clear_env = no' /etc/php85/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php85/php-fpm.d/www.conf; fi && \
33+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php85/php-fpm.conf && \
3534
echo "**** setup php opcache ****" && \
3635
{ \
3736
echo 'opcache.memory_consumption=128'; \
3837
echo 'opcache.interned_strings_buffer=8'; \
3938
echo 'opcache.max_accelerated_files=4000'; \
4039
echo 'opcache.revalidate_freq=2'; \
4140
echo 'opcache.fast_shutdown=1'; \
42-
} > /etc/php84/conf.d/opcache-recommended.ini; \
41+
} > /etc/php85/conf.d/opcache-recommended.ini; \
4342
\
4443
{ \
4544
echo 'session.cookie_httponly=1'; \
4645
echo 'session.use_strict_mode=1'; \
47-
} > /etc/php84/conf.d/session-strict.ini; \
46+
} > /etc/php85/conf.d/session-strict.ini; \
4847
\
4948
{ \
5049
echo 'allow_url_fopen=Off'; \
@@ -53,7 +52,7 @@ RUN \
5352
echo 'memory_limit=${MEMORY_LIMIT}'; \
5453
echo 'post_max_size=${UPLOAD_LIMIT}'; \
5554
echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
56-
} > /etc/php84/conf.d/phpmyadmin-misc.ini && \
55+
} > /etc/php85/conf.d/phpmyadmin-misc.ini && \
5756
echo "**** install phpmyadmin ****" && \
5857
mkdir -p /app/www/public && \
5958
if [ -z ${PHPMYADMIN_VERSION+x} ]; then \

Dockerfile.aarch64

Lines changed: 13 additions & 14 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.23
44

55
# set version label
66
ARG BUILD_DATE
@@ -21,30 +21,29 @@ RUN \
2121
gpg-agent \
2222
gnupg-dirmngr && \
2323
apk add --no-cache \
24-
php84-bz2 \
25-
php84-dom \
26-
php84-gd \
27-
php84-mysqli \
28-
php84-opcache \
29-
php84-pecl-uploadprogress \
30-
php84-tokenizer && \
24+
php85-bz2 \
25+
php85-dom \
26+
php85-gd \
27+
php85-mysqli \
28+
php85-pecl-uploadprogress \
29+
php85-tokenizer && \
3130
echo "**** configure php-fpm to pass env vars ****" && \
32-
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
33-
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 && \
34-
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
31+
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \
32+
if ! grep -qxF 'clear_env = no' /etc/php85/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php85/php-fpm.d/www.conf; fi && \
33+
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php85/php-fpm.conf && \
3534
echo "**** setup php opcache ****" && \
3635
{ \
3736
echo 'opcache.memory_consumption=128'; \
3837
echo 'opcache.interned_strings_buffer=8'; \
3938
echo 'opcache.max_accelerated_files=4000'; \
4039
echo 'opcache.revalidate_freq=2'; \
4140
echo 'opcache.fast_shutdown=1'; \
42-
} > /etc/php84/conf.d/opcache-recommended.ini; \
41+
} > /etc/php85/conf.d/opcache-recommended.ini; \
4342
\
4443
{ \
4544
echo 'session.cookie_httponly=1'; \
4645
echo 'session.use_strict_mode=1'; \
47-
} > /etc/php84/conf.d/session-strict.ini; \
46+
} > /etc/php85/conf.d/session-strict.ini; \
4847
\
4948
{ \
5049
echo 'allow_url_fopen=Off'; \
@@ -53,7 +52,7 @@ RUN \
5352
echo 'memory_limit=${MEMORY_LIMIT}'; \
5453
echo 'post_max_size=${UPLOAD_LIMIT}'; \
5554
echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
56-
} > /etc/php84/conf.d/phpmyadmin-misc.ini && \
55+
} > /etc/php85/conf.d/phpmyadmin-misc.ini && \
5756
echo "**** install phpmyadmin ****" && \
5857
mkdir -p /app/www/public && \
5958
if [ -z ${PHPMYADMIN_VERSION+x} ]; then \

README.md

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

302302
## Versions
303303

304+
* **28.12.25:** - Rebase to Alpine 3.23.
304305
* **23.08.25:** - Add support for mTLS. Existing users will need to delete their config.inc.php and restart the container.
305306
* **05.07.25:** - Rebase to Alpine 3.22.
306307
* **19.12.24:** - Rebase to Alpine 3.21.

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ init_diagram: |
9595
"phpmyadmin:latest" <- Base Images
9696
# changelog
9797
changelogs:
98+
- {date: "28.12.25:", desc: "Rebase to Alpine 3.23."}
9899
- {date: "23.08.25:", desc: "Add support for mTLS. Existing users will need to delete their config.inc.php and restart the container."}
99100
- {date: "05.07.25:", desc: "Rebase to Alpine 3.22."}
100101
- {date: "19.12.24:", desc: "Rebase to Alpine 3.21."}

0 commit comments

Comments
 (0)