Merge pull request #47 from linuxserver/3.23

This commit is contained in:
Adam 2026-01-04 21:08:25 +00:00 committed by GitHub
commit e3964e4b6d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 28 additions and 28 deletions

View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.23
# set version label
ARG BUILD_DATE
@ -21,17 +21,16 @@ RUN \
gpg-agent \
gnupg-dirmngr && \
apk add --no-cache \
php84-bz2 \
php84-dom \
php84-gd \
php84-mysqli \
php84-opcache \
php84-pecl-uploadprogress \
php84-tokenizer && \
php85-bz2 \
php85-dom \
php85-gd \
php85-mysqli \
php85-pecl-uploadprogress \
php85-tokenizer && \
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 && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \
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 && \
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php85/php-fpm.conf && \
echo "**** setup php opcache ****" && \
{ \
echo 'opcache.memory_consumption=128'; \
@ -39,12 +38,12 @@ RUN \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=2'; \
echo 'opcache.fast_shutdown=1'; \
} > /etc/php84/conf.d/opcache-recommended.ini; \
} > /etc/php85/conf.d/opcache-recommended.ini; \
\
{ \
echo 'session.cookie_httponly=1'; \
echo 'session.use_strict_mode=1'; \
} > /etc/php84/conf.d/session-strict.ini; \
} > /etc/php85/conf.d/session-strict.ini; \
\
{ \
echo 'allow_url_fopen=Off'; \
@ -53,7 +52,7 @@ RUN \
echo 'memory_limit=${MEMORY_LIMIT}'; \
echo 'post_max_size=${UPLOAD_LIMIT}'; \
echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
} > /etc/php84/conf.d/phpmyadmin-misc.ini && \
} > /etc/php85/conf.d/phpmyadmin-misc.ini && \
echo "**** install phpmyadmin ****" && \
mkdir -p /app/www/public && \
if [ -z ${PHPMYADMIN_VERSION+x} ]; then \

View File

@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22
FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.23
# set version label
ARG BUILD_DATE
@ -21,17 +21,16 @@ RUN \
gpg-agent \
gnupg-dirmngr && \
apk add --no-cache \
php84-bz2 \
php84-dom \
php84-gd \
php84-mysqli \
php84-opcache \
php84-pecl-uploadprogress \
php84-tokenizer && \
php85-bz2 \
php85-dom \
php85-gd \
php85-mysqli \
php85-pecl-uploadprogress \
php85-tokenizer && \
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 && \
sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/php-fpm.d/www.conf && \
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 && \
echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php85/php-fpm.conf && \
echo "**** setup php opcache ****" && \
{ \
echo 'opcache.memory_consumption=128'; \
@ -39,12 +38,12 @@ RUN \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=2'; \
echo 'opcache.fast_shutdown=1'; \
} > /etc/php84/conf.d/opcache-recommended.ini; \
} > /etc/php85/conf.d/opcache-recommended.ini; \
\
{ \
echo 'session.cookie_httponly=1'; \
echo 'session.use_strict_mode=1'; \
} > /etc/php84/conf.d/session-strict.ini; \
} > /etc/php85/conf.d/session-strict.ini; \
\
{ \
echo 'allow_url_fopen=Off'; \
@ -53,7 +52,7 @@ RUN \
echo 'memory_limit=${MEMORY_LIMIT}'; \
echo 'post_max_size=${UPLOAD_LIMIT}'; \
echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \
} > /etc/php84/conf.d/phpmyadmin-misc.ini && \
} > /etc/php85/conf.d/phpmyadmin-misc.ini && \
echo "**** install phpmyadmin ****" && \
mkdir -p /app/www/public && \
if [ -z ${PHPMYADMIN_VERSION+x} ]; then \

View File

@ -301,6 +301,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **28.12.25:** - Rebase to Alpine 3.23.
* **23.08.25:** - Add support for mTLS. Existing users will need to delete their config.inc.php and restart the container.
* **05.07.25:** - Rebase to Alpine 3.22.
* **19.12.24:** - Rebase to Alpine 3.21.

View File

@ -95,6 +95,7 @@ init_diagram: |
"phpmyadmin:latest" <- Base Images
# changelog
changelogs:
- {date: "28.12.25:", desc: "Rebase to Alpine 3.23."}
- {date: "23.08.25:", desc: "Add support for mTLS. Existing users will need to delete their config.inc.php and restart the container."}
- {date: "05.07.25:", desc: "Rebase to Alpine 3.22."}
- {date: "19.12.24:", desc: "Rebase to Alpine 3.21."}