Bot Updating Package Versions

Dockerfile

@@ -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 \
+    php85-bz2 \
-    php84-dom \
+    php85-dom \
-    php84-gd \
+    php85-gd \
-    php84-mysqli \
+    php85-mysqli \
-    php84-opcache \
+    php85-pecl-uploadprogress \
-    php84-pecl-uploadprogress \
+    php85-tokenizer && \
-    php84-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 && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/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 && \
+  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/php84/php-fpm.conf && \
+  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 \

Dockerfile.aarch64

@@ -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 \
+    php85-bz2 \
-    php84-dom \
+    php85-dom \
-    php84-gd \
+    php85-gd \
-    php84-mysqli \
+    php85-mysqli \
-    php84-opcache \
+    php85-pecl-uploadprogress \
-    php84-pecl-uploadprogress \
+    php85-tokenizer && \
-    php84-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 && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php85/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 'clear_env = no' >> /etc/php84/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/php84/php-fpm.conf && \
+  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 \

Jenkinsfile

@@ -211,6 +211,7 @@ pipeline {
           env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
           env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
+          env.CITEST_IMAGETAG = 'latest'
         }
       }
     }
@@ -236,6 +237,7 @@ pipeline {
           env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
           env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
+          env.CITEST_IMAGETAG = 'develop'
         }
       }
     }
@@ -261,6 +263,7 @@ pipeline {
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
           env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
+          env.CITEST_IMAGETAG = 'develop'
         }
       }
     }
@@ -283,7 +286,7 @@ pipeline {
                   -v ${WORKSPACE}:/mnt \
                   -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
                   -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                  ghcr.io/linuxserver/baseimage-alpine:3 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
                     apk add --no-cache python3 && \
                     python3 -m venv /lsiopy && \
                     pip install --no-cache-dir -U pip && \
@@ -618,13 +621,16 @@ pipeline {
                     echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                     echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                     echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+
                     if [[ "${PACKAGE_CHECK}" != "true" ]]; then
+                      declare -A pids
                       IFS=',' read -ra CACHE <<< "$BUILDCACHE"
                       for i in "${CACHE[@]}"; do
                         docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
+                        pids[$!]="$i"
                       done
-                      for p in $(jobs -p); do
+                      for p in "${!pids[@]}"; do
-                        wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                        wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
                       done
                     fi
                 '''
@@ -684,13 +690,16 @@ pipeline {
                         echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                         echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                         echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+
                         if [[ "${PACKAGE_CHECK}" != "true" ]]; then
+                          declare -A pids
                           IFS=',' read -ra CACHE <<< "$BUILDCACHE"
                           for i in "${CACHE[@]}"; do
                             docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
+                            pids[$!]="$i"
                           done
-                          for p in $(jobs -p); do
+                          for p in "${!pids[@]}"; do
-                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                            wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
                           done
                         fi
                     '''
@@ -744,12 +753,14 @@ pipeline {
                         echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                         echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                         if [[ "${PACKAGE_CHECK}" != "true" ]]; then
+                          declare -A pids
                           IFS=',' read -ra CACHE <<< "$BUILDCACHE"
                           for i in "${CACHE[@]}"; do
                             docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
+                            pids[$!]="$i"
                           done
-                          for p in $(jobs -p); do
+                          for p in "${!pids[@]}"; do
-                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                            wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
                           done
                         fi
                     '''
@@ -874,7 +885,7 @@ pipeline {
                     CI_DOCKERENV="LSIO_FIRST_PARTY=true"
                   fi
                 fi
-                docker pull ghcr.io/linuxserver/ci:latest
+                docker pull ghcr.io/linuxserver/ci:${CITEST_IMAGETAG}
                 if [ "${MULTIARCH}" == "true" ]; then
                   docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
                   docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
@@ -898,7 +909,9 @@ pipeline {
                 -e WEB_PATH=\"${CI_WEBPATH}\" \
                 -e NODE_NAME=\"${NODE_NAME}\" \
                 -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
-                -t ghcr.io/linuxserver/ci:latest \
+                -e COMMIT_SHA=\"${COMMIT_SHA}\" \
+                -e BUILD_NUMBER=\"${BUILD_NUMBER}\" \
+                -t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \
                 python3 test_build.py'''
         }
       }
@@ -924,9 +937,11 @@ pipeline {
                           CACHEIMAGE=${i}
                       fi
                   done
-                  docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
+                    { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
                   if [ -n "${SEMVER}" ]; then
-                    docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
+                      { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
                   fi
                 done
               '''
@@ -951,20 +966,27 @@ pipeline {
                           CACHEIMAGE=${i}
                       fi
                   done
-                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
-                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
+                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
+                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
                   if [ -n "${SEMVER}" ]; then
-                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
-                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                      { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
+                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
+                      { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
                   fi
                 done
                 for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                  docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest || \
-                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
-
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
-                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \
+                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
                   if [ -n "${SEMVER}" ]; then
-                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \
+                      { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
                   fi
                 done
               '''
@@ -982,23 +1004,41 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        echo "Pushing New tag for current commit ${META_TAG}"
-        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
-        -d '{"tag":"'${META_TAG}'",\
-             "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to main",\
-             "type": "commit",\
-             "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
-        echo "Pushing New release for Tag"
         sh '''#! /bin/bash
+              echo "Auto-generating release notes"
+              if [ "$(git tag --points-at HEAD)" != "" ]; then
+                echo "Existing tag points to current commit, suggesting no new LS changes"
+                AUTO_RELEASE_NOTES="No changes"
+              else
+                AUTO_RELEASE_NOTES=$(curl -fsL -H "Authorization: token ${GITHUB_TOKEN}" -H "Accept: application/vnd.github+json" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/generate-notes  \
+                  -d '{"tag_name":"'${META_TAG}'",\
+                      "target_commitish": "main"}' \
+                  | jq -r '.body' | sed 's|## What.s Changed||')
+              fi
+              echo "Pushing New tag for current commit ${META_TAG}"
+              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
+                -d '{"tag":"'${META_TAG}'",\
+                  "object": "'${COMMIT_SHA}'",\
+                  "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to main",\
+                  "type": "commit",\
+                  "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}'
+              echo "Pushing New release for Tag"
               echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
-              echo '{"tag_name":"'${META_TAG}'",\
+              jq -n \
-                     "target_commitish": "main",\
+                --arg tag_name "$META_TAG" \
-                     "name": "'${META_TAG}'",\
+                --arg target_commitish "main" \
-                     "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
+                --arg ci_url "${CI_URL:-N/A}" \
-              printf '","draft": false,"prerelease": false}' >> releasebody.json
+                --arg ls_notes "$AUTO_RELEASE_NOTES" \
-              paste -d'\\0' start releasebody.json > releasebody.json.done
+                --arg remote_notes "$(cat releasebody.json)" \
-              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
+                '{
+                  "tag_name": $tag_name,
+                  "target_commitish": $target_commitish,
+                  "name": $tag_name,
+                  "body": ("**CI Report:**\\n\\n" + $ci_url + "\\n\\n**LinuxServer Changes:**\\n\\n" + $ls_notes + "\\n\\n**Remote Changes:**\\n\\n" + $remote_notes),
+                  "draft": false,
+                  "prerelease": false                }' > releasebody.json.done
+              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done
+        '''
       }
     }
     // Add protection to the release branch

README.md

@@ -301,6 +301,8 @@ 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.
 * **27.05.24:** - Existing users should update their nginx confs to avoid http2 deprecation warnings.

package_versions.txt

@@ -1,130 +1,130 @@
 NAME                              VERSION               TYPE           
 acl-libs                          2.3.2-r1              apk             
-alpine-baselayout                 3.7.0-r0              apk             
+alpine-baselayout                 3.7.1-r8              apk             
-alpine-baselayout-data            3.7.0-r0              apk             
+alpine-baselayout-data            3.7.1-r8              apk             
-alpine-keys                       2.5-r0                apk             
+alpine-keys                       2.6-r0                apk             
-alpine-release                    3.22.0-r0             apk             
+alpine-release                    3.23.2-r0             apk             
-aom-libs                          3.12.1-r0             apk             
+aom-libs                          3.13.1-r0             apk             
-apache2-utils                     2.4.64-r0             apk             
+apache2-utils                     2.4.66-r0             apk             
-apk-tools                         2.14.9-r2             apk             
+apk-tools                         3.0.3-r1              apk             
-apr                               1.7.5-r0              apk             
+apr                               1.7.6-r0              apk             
-apr-util                          1.6.3-r1              apk             
+apr-util                          1.6.3-r2              apk             
 argon2-libs                       20190702-r5           apk             
 bacon/bacon-qr-code               2.0.8                 php-composer    
-bash                              5.2.37-r0             apk             
+bash                              5.3.3-r1              apk             
 beberlei/assert                   v3.3.3                php-composer    
 brick/math                        0.8.17                php-composer    
-brotli-libs                       1.1.0-r2              apk             
+brotli-libs                       1.2.0-r0              apk             
-busybox                           1.37.0-r18            apk             
+busybox                           1.37.0-r30            apk             
-busybox-binsh                     1.37.0-r18            apk             
+busybox-binsh                     1.37.0-r30            apk             
-c-ares                            1.34.5-r0             apk             
+c-ares                            1.34.6-r0             apk             
-ca-certificates                   20241121-r2           apk             
+ca-certificates                   20251003-r0           apk             
-ca-certificates-bundle            20241121-r2           apk             
+ca-certificates-bundle            20251003-r0           apk             
 catatonit                         0.2.1-r0              apk             
 code-lts/u2f-php-server           v1.2.2                php-composer    
-composer                          2.8.10                binary          
+composer                          2.9.5                 binary          
-composer/ca-bundle                1.5.5                 php-composer    
+composer/ca-bundle                1.5.8                 php-composer    
-coreutils                         9.7-r1                apk             
+coreutils                         9.8-r1                apk             
-coreutils-env                     9.7-r1                apk             
+coreutils-env                     9.8-r1                apk             
-coreutils-fmt                     9.7-r1                apk             
+coreutils-fmt                     9.8-r1                apk             
-coreutils-sha512sum               9.7-r1                apk             
+coreutils-sha512sum               9.8-r1                apk             
-curl                              8.14.1-r1             apk             
+curl                              8.17.0-r1             apk             
-dasprid/enum                      1.0.6                 php-composer    
+dasprid/enum                      1.0.7                 php-composer    
 fgrosse/phpasn1                   v2.5.0                php-composer    
 fig/http-message-util             1.1.5                 php-composer    
 findutils                         4.10.0-r0             apk             
-freetype                          2.13.3-r0             apk             
+freetype                          2.14.1-r0             apk             
-git                               2.49.1-r0             apk             
+git                               2.52.0-r0             apk             
-git-init-template                 2.49.1-r0             apk             
+git-init-template                 2.52.0-r0             apk             
 google/recaptcha                  1.2.4                 php-composer    
-jq                                1.8.0-r0              apk             
+jq                                1.8.1-r0              apk             
 league/uri                        6.4.0                 php-composer    
 league/uri-interfaces             2.3.0                 php-composer    
-libapk2                           2.14.9-r2             apk             
+libapk                            3.0.3-r1              apk             
 libattr                           2.5.2-r2              apk             
 libavif                           1.3.0-r0              apk             
 libbsd                            0.12.2-r0             apk             
 libbz2                            1.0.8-r6              apk             
-libcrypto3                        3.5.1-r0              apk             
+libcrypto3                        3.5.5-r0              apk             
-libcurl                           8.14.1-r1             apk             
+libcurl                           8.17.0-r1             apk             
-libdav1d                          1.5.1-r0              apk             
+libdav1d                          1.5.2-r0              apk             
-libedit                           20250104.3.1-r1       apk             
+libedit                           20251016.3.1-r0       apk             
-libexpat                          2.7.1-r0              apk             
+libexpat                          2.7.3-r0              apk             
-libgcc                            14.2.0-r6             apk             
+libgcc                            15.2.0-r2             apk             
 libice                            1.1.2-r0              apk             
-libidn2                           2.3.7-r0              apk             
+libidn2                           2.3.8-r0              apk             
-libintl                           0.24.1-r0             apk             
+libintl                           0.24.1-r1             apk             
-libjpeg-turbo                     3.1.0-r0              apk             
+libjpeg-turbo                     3.1.2-r0              apk             
 libmd                             1.1.0-r0              apk             
-libncursesw                       6.5_p20250503-r0      apk             
+libncursesw                       6.5_p20251123-r0      apk             
-libpng                            1.6.47-r0             apk             
+libpng                            1.6.54-r0             apk             
-libproc2                          4.0.4-r3              apk             
+libproc2                          4.0.5-r0              apk             
 libpsl                            0.21.5-r3             apk             
-libsharpyuv                       1.5.0-r0              apk             
+libsharpyuv                       1.6.0-r0              apk             
-libsm                             1.2.5-r0              apk             
+libsm                             1.2.6-r0              apk             
-libssl3                           3.5.1-r0              apk             
+libssl3                           3.5.5-r0              apk             
-libstdc++                         14.2.0-r6             apk             
+libstdc++                         15.2.0-r2             apk             
-libunistring                      1.3-r0                apk             
+libunistring                      1.4.1-r0              apk             
-libuuid                           2.41-r9               apk             
+libuuid                           2.41.2-r0             apk             
-libwebp                           1.5.0-r0              apk             
+libwebp                           1.6.0-r0              apk             
-libx11                            1.8.11-r0             apk             
+libx11                            1.8.12-r1             apk             
 libxau                            1.0.12-r0             apk             
-libxcb                            1.17.0-r0             apk             
+libxcb                            1.17.0-r1             apk             
 libxdmcp                          1.1.5-r1              apk             
 libxext                           1.3.6-r2              apk             
-libxml2                           2.13.8-r0             apk             
+libxml2                           2.13.9-r0             apk             
 libxpm                            3.5.17-r0             apk             
 libxt                             1.3.1-r0              apk             
 libyuv                            0.0.1887.20251502-r1  apk             
-libzip                            1.11.4-r0             apk             
+libzip                            1.11.4-r1             apk             
-linux-pam                         1.7.0-r4              apk             
+linux-pam                         1.7.1-r2              apk             
-logrotate                         3.21.0-r1             apk             
+logrotate                         3.22.0-r0             apk             
-musl                              1.2.5-r10             apk             
+musl                              1.2.5-r21             apk             
-musl-utils                        1.2.5-r10             apk             
+musl-utils                        1.2.5-r21             apk             
-nano                              8.4-r0                apk             
+nano                              8.7-r0                apk             
-ncurses-terminfo-base             6.5_p20250503-r0      apk             
+ncurses-terminfo-base             6.5_p20251123-r0      apk             
-netcat-openbsd                    1.229.1-r0            apk             
+netcat-openbsd                    1.234.1-r0            apk             
-nghttp2-libs                      1.65.0-r0             apk             
+nghttp2-libs                      1.68.0-r0             apk             
-nginx                             1.28.0-r3             apk             
+nghttp3                           1.13.1-r0             apk             
+nginx                             1.28.0-r8             apk             
 nikic/fast-route                  v1.3.0                php-composer    
 oniguruma                         6.9.10-r0             apk             
-openssl                           3.5.1-r0              apk             
+openssl                           3.5.5-r0              apk             
-paragonie/constant_time_encoding  v2.7.0                php-composer    
+paragonie/constant_time_encoding  v2.8.2                php-composer    
 paragonie/random_compat           v9.99.100             php-composer    
-paragonie/sodium_compat           v1.21.1               php-composer    
+paragonie/sodium_compat           v1.23.0               php-composer    
-pcre2                             10.43-r1              apk             
+pcre2                             10.47-r0              apk             
-php84                             8.4.10-r0             apk             
+php85                             8.5.2-r0              apk             
-php84-bz2                         8.4.10-r0             apk             
+php85-bz2                         8.5.2-r0              apk             
-php84-common                      8.4.10-r0             apk             
+php85-common                      8.5.2-r0              apk             
-php84-ctype                       8.4.10-r0             apk             
+php85-ctype                       8.5.2-r0              apk             
-php84-curl                        8.4.10-r0             apk             
+php85-curl                        8.5.2-r0              apk             
-php84-dom                         8.4.10-r0             apk             
+php85-dom                         8.5.2-r0              apk             
-php84-fileinfo                    8.4.10-r0             apk             
+php85-fileinfo                    8.5.2-r0              apk             
-php84-fpm                         8.4.10-r0             apk             
+php85-fpm                         8.5.2-r0              apk             
-php84-gd                          8.4.10-r0             apk             
+php85-gd                          8.5.2-r0              apk             
-php84-iconv                       8.4.10-r0             apk             
+php85-iconv                       8.5.2-r0              apk             
-php84-mbstring                    8.4.10-r0             apk             
+php85-mbstring                    8.5.2-r0              apk             
-php84-mysqli                      8.4.10-r0             apk             
+php85-mysqli                      8.5.2-r0              apk             
-php84-mysqlnd                     8.4.10-r0             apk             
+php85-mysqlnd                     8.5.2-r0              apk             
-php84-opcache                     8.4.10-r0             apk             
+php85-openssl                     8.5.2-r0              apk             
-php84-openssl                     8.4.10-r0             apk             
+php85-pecl-uploadprogress         2.0.2-r1              apk             
-php84-pecl-uploadprogress         2.0.2-r2              apk             
+php85-phar                        8.5.2-r0              apk             
-php84-phar                        8.4.10-r0             apk             
+php85-session                     8.5.2-r0              apk             
-php84-session                     8.4.10-r0             apk             
+php85-simplexml                   8.5.2-r0              apk             
-php84-simplexml                   8.4.10-r0             apk             
+php85-tokenizer                   8.5.2-r0              apk             
-php84-tokenizer                   8.4.10-r0             apk             
+php85-xml                         8.5.2-r0              apk             
-php84-xml                         8.4.10-r0             apk             
+php85-xmlwriter                   8.5.2-r0              apk             
-php84-xmlwriter                   8.4.10-r0             apk             
+php85-zip                         8.5.2-r0              apk             
-php84-zip                         8.4.10-r0             apk             
+phpmyadmin                        5.2.3                 npm             
-phpmyadmin                        5.2.2                 npm             
+phpmyadmin/motranslator           5.4.0                 php-composer    
-phpmyadmin/motranslator           5.3.1                 php-composer    
 phpmyadmin/shapefile              3.0.2                 php-composer    
-phpmyadmin/sql-parser             5.10.3                php-composer    
+phpmyadmin/sql-parser             5.11.1                php-composer    
-phpmyadmin/twig-i18n-extension    4.1.3                 php-composer    
+phpmyadmin/twig-i18n-extension    4.1.5                 php-composer    
 popt                              1.19-r4               apk             
-pragmarx/google2fa                v8.0.3                php-composer    
+pragmarx/google2fa                v9.0.0                php-composer    
 pragmarx/google2fa-qrcode         v2.1.1                php-composer    
-procps-ng                         4.0.4-r3              apk             
+procps-ng                         4.0.5-r0              apk             
 psr/cache                         1.0.1                 php-composer    
 psr/container                     1.1.1                 php-composer    
 psr/http-client                   1.0.3                 php-composer    
@@ -134,14 +134,14 @@ psr/log                           1.1.4                 php-composer
 ralouphie/getallheaders           3.0.3                 php-composer    
 ramsey/collection                 1.1.4                 php-composer    
 ramsey/uuid                       4.2.3                 php-composer    
-readline                          8.2.13-r1             apk             
+readline                          8.3.1-r0              apk             
-scanelf                           1.3.8-r1              apk             
+scanelf                           1.3.8-r2              apk             
-shadow                            4.17.3-r0             apk             
+shadow                            4.18.0-r0             apk             
 skalibs-libs                      2.14.4.0-r0           apk             
-slim/psr7                         1.4.1                 php-composer    
+slim/psr7                         1.4.2                 php-composer    
 spomky-labs/base64url             v2.0.4                php-composer    
 spomky-labs/cbor-php              v1.1.1                php-composer    
-ssl_client                        1.37.0-r18            apk             
+ssl_client                        1.37.0-r30            apk             
 symfony/cache                     v5.4.46               php-composer    
 symfony/cache-contracts           v2.5.4                php-composer    
 symfony/config                    v5.4.46               php-composer    
@@ -149,24 +149,26 @@ symfony/dependency-injection      v5.4.48               php-composer
 symfony/deprecation-contracts     v2.5.4                php-composer    
 symfony/expression-language       v5.4.45               php-composer    
 symfony/filesystem                v5.4.45               php-composer    
-symfony/polyfill-ctype            v1.31.0               php-composer    
+symfony/polyfill-ctype            v1.33.0               php-composer    
-symfony/polyfill-mbstring         v1.31.0               php-composer    
+symfony/polyfill-iconv            v1.33.0               php-composer    
-symfony/polyfill-php73            v1.31.0               php-composer    
+symfony/polyfill-mbstring         v1.33.0               php-composer    
-symfony/polyfill-php80            v1.31.0               php-composer    
+symfony/polyfill-php73            v1.33.0               php-composer    
-symfony/polyfill-php81            v1.31.0               php-composer    
+symfony/polyfill-php80            v1.33.0               php-composer    
+symfony/polyfill-php81            v1.33.0               php-composer    
+symfony/polyfill-php84            v1.33.0               php-composer    
 symfony/process                   v5.4.47               php-composer    
 symfony/service-contracts         v2.5.4                php-composer    
 symfony/var-exporter              v5.4.45               php-composer    
-tecnickcom/tcpdf                  6.8.0                 php-composer    
+tecnickcom/tcpdf                  6.10.0                php-composer    
-thecodingmachine/safe             v1.3.3                php-composer    
+thecodingmachine/safe             v1.3.3.1              php-composer    
 twig/twig                         v3.11.3               php-composer    
-tzdata                            2025b-r0              apk             
+tzdata                            2025c-r0              apk             
 utmps-libs                        0.1.3.1-r0            apk             
 web-auth/cose-lib                 v3.3.12               php-composer    
 web-auth/metadata-service         v3.3.12               php-composer    
 web-auth/webauthn-lib             v3.3.12               php-composer    
 webmozart/assert                  1.11.0                php-composer    
 williamdes/mariadb-mysql-kbs      v1.3.0                php-composer    
-xz-libs                           5.8.1-r0              apk             
+xz-libs                           5.8.2-r0              apk             
 zlib                              1.3.1-r2              apk             
-zstd-libs                         1.5.7-r0              apk             
+zstd-libs                         1.5.7-r2              apk             

readme-vars.yml

@@ -90,11 +90,13 @@ init_diagram: |
     svc-php-fpm -> legacy-services
   }
   Base Images: {
-    "baseimage-alpine-nginx:3.22" <- "baseimage-alpine:3.22"
+    "baseimage-alpine-nginx:3.23" <- "baseimage-alpine:3.23"
   }
   "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."}
   - {date: "27.05.24:", desc: "Existing users should update their nginx confs to avoid http2 deprecation warnings."}

root/defaults/config.inc.php

@@ -2,10 +2,11 @@
 
 // Sourced from https://github.com/phpmyadmin/docker/blob/master/config.inc.php
 
-require('/config/phpmyadmin/config.secret.inc.php');
+require_once '/config/phpmyadmin/config.secret.inc.php';
+require_once '/config/phpmyadmin/helpers.php';
 
 /* Ensure we got the environment */
-$vars = array(
+$vars = [
     'PMA_ARBITRARY',
     'PMA_HOST',
     'PMA_HOSTS',
@@ -26,20 +27,45 @@ $vars = array(
     'PMA_QUERYHISTORYDB',
     'PMA_QUERYHISTORYMAX',
     'MAX_EXECUTION_TIME',
-    'MEMORY_LIMIT'
+    'MEMORY_LIMIT',
-);
+    'PMA_UPLOADDIR',
+    'PMA_SAVEDIR',
+    'PMA_SSL',
+    'PMA_SSLS',
+    'PMA_SSL_DIR',
+    'PMA_SSL_VERIFY',
+    'PMA_SSL_VERIFIES',
+    'PMA_SSL_CA',
+    'PMA_SSL_CAS',
+    'PMA_SSL_CA_BASE64',
+    'PMA_SSL_CAS_BASE64',
+    'PMA_SSL_KEY',
+    'PMA_SSL_KEYS',
+    'PMA_SSL_KEY_BASE64',
+    'PMA_SSL_KEYS_BASE64',
+    'PMA_SSL_CERT',
+    'PMA_SSL_CERTS',
+    'PMA_SSL_CERT_BASE64',
+    'PMA_SSL_CERTS_BASE64',
+];
+
 foreach ($vars as $var) {
     $env = getenv($var);
     if (!isset($_ENV[$var]) && $env !== false) {
         $_ENV[$var] = $env;
     }
 }
+
+if (! defined('PMA_SSL_DIR')) {
+    define('PMA_SSL_DIR', $_ENV['PMA_SSL_DIR'] ?? '/config/phpmyadmin/ssl');
+}
+
 if (isset($_ENV['PMA_QUERYHISTORYDB'])) {
-    $cfg['QueryHistoryDB'] = boolval($_ENV['PMA_QUERYHISTORYDB']);
+    $cfg['QueryHistoryDB'] = (bool) $_ENV['PMA_QUERYHISTORYDB'];
 }
 
 if (isset($_ENV['PMA_QUERYHISTORYMAX'])) {
-    $cfg['QueryHistoryMax'] = intval($_ENV['PMA_QUERYHISTORYMAX']);
+    $cfg['QueryHistoryMax'] = (int) $_ENV['PMA_QUERYHISTORYMAX'];
 }
 
 /* Arbitrary server connection */
@@ -52,29 +78,84 @@ if (isset($_ENV['PMA_ABSOLUTE_URI'])) {
     $cfg['PmaAbsoluteUri'] = trim($_ENV['PMA_ABSOLUTE_URI']);
 }
 
+if (isset($_ENV['PMA_SSL_CA_BASE64'])) {
+    $_ENV['PMA_SSL_CA'] = decodeBase64AndSaveFiles($_ENV['PMA_SSL_CA_BASE64'], 'phpmyadmin-ssl-CA', 'pem', PMA_SSL_DIR);
+}
+
+/* Decode and save the SSL key from base64 */
+if (isset($_ENV['PMA_SSL_KEY_BASE64'])) {
+    $_ENV['PMA_SSL_KEY'] = decodeBase64AndSaveFiles($_ENV['PMA_SSL_KEY_BASE64'], 'phpmyadmin-ssl-CERT', 'cert', PMA_SSL_DIR);
+}
+
+/* Decode and save the SSL certificate from base64 */
+if (isset($_ENV['PMA_SSL_CERT_BASE64'])) {
+    $_ENV['PMA_SSL_CERT'] = decodeBase64AndSaveFiles($_ENV['PMA_SSL_CERT_BASE64'], 'phpmyadmin-ssl-CERT', 'cert', PMA_SSL_DIR);
+}
+
+/* Decode and save multiple SSL CA certificates from base64 */
+if (isset($_ENV['PMA_SSL_CAS_BASE64'])) {
+    $_ENV['PMA_SSL_CAS'] = decodeBase64AndSaveFiles($_ENV['PMA_SSL_CAS_BASE64'], 'phpmyadmin-ssl-CA', 'pem', PMA_SSL_DIR);
+}
+
+/* Decode and save multiple SSL keys from base64 */
+if (isset($_ENV['PMA_SSL_KEYS_BASE64'])) {
+    $_ENV['PMA_SSL_KEYS'] = decodeBase64AndSaveFiles($_ENV['PMA_SSL_KEYS_BASE64'], 'phpmyadmin-ssl-CERT', 'cert', PMA_SSL_DIR);
+}
+
+/* Decode and save multiple SSL certificates from base64 */
+if (isset($_ENV['PMA_SSL_CERTS_BASE64'])) {
+    $_ENV['PMA_SSL_CERTS'] = decodeBase64AndSaveFiles($_ENV['PMA_SSL_CERTS_BASE64'], 'phpmyadmin-ssl-KEY', 'key', PMA_SSL_DIR);
+}
+
 /* Figure out hosts */
 
 /* Fallback to default linked */
-$hosts = array('db');
+$hosts = ['db'];
 
 /* Set by environment */
-if (!empty($_ENV['PMA_HOST'])) {
+if (! empty($_ENV['PMA_HOST'])) {
-    $hosts = array($_ENV['PMA_HOST']);
+    $hosts = [$_ENV['PMA_HOST']];
-    $verbose = array($_ENV['PMA_VERBOSE']);
+    $verbose = [$_ENV['PMA_VERBOSE']];
-    $ports = array($_ENV['PMA_PORT']);
+    $ports = [$_ENV['PMA_PORT']];
-} elseif (!empty($_ENV['PMA_HOSTS'])) {
+    $ssls = [$_ENV['PMA_SSL']];
+    $ssl_verifies = [$_ENV['PMA_SSL_VERIFY']];
+    $ssl_cas = [$_ENV['PMA_SSL_CA']];
+    $ssl_keys = [$_ENV['PMA_SSL_KEY']];
+    $ssl_certs = [$_ENV['PMA_SSL_CERT']];
+} elseif (! empty($_ENV['PMA_HOSTS'])) {
     $hosts = array_map('trim', explode(',', $_ENV['PMA_HOSTS']));
     $verbose = array_map('trim', explode(',', $_ENV['PMA_VERBOSES']));
     $ports = array_map('trim', explode(',', $_ENV['PMA_PORTS']));
+    $ssls = array_map('trim', explode(',', $_ENV['PMA_SSLS']));
+    $ssl_verifies = array_map('trim', explode(',', $_ENV['PMA_SSL_VERIFIES']));
+    $ssl_cas = array_map('trim', explode(',', $_ENV['PMA_SSL_CAS']));
+    $ssl_keys = array_map('trim', explode(',', $_ENV['PMA_SSL_KEYS']));
+    $ssl_certs = array_map('trim', explode(',', $_ENV['PMA_SSL_CERTS']));
 }
-if (!empty($_ENV['PMA_SOCKET'])) {
+
-    $sockets = array($_ENV['PMA_SOCKET']);
+if (! empty($_ENV['PMA_SOCKET'])) {
-} elseif (!empty($_ENV['PMA_SOCKETS'])) {
+    $sockets = [$_ENV['PMA_SOCKET']];
+} elseif (! empty($_ENV['PMA_SOCKETS'])) {
     $sockets = explode(',', $_ENV['PMA_SOCKETS']);
 }
 
 /* Server settings */
 for ($i = 1; isset($hosts[$i - 1]); $i++) {
+    if (isset($ssls[$i - 1]) && $ssls[$i - 1] === '1') {
+        $cfg['Servers'][$i]['ssl'] = $ssls[$i - 1];
+    }
+    if (isset($ssl_verifies[$i - 1]) && $ssl_verifies[$i - 1] === '1') {
+        $cfg['Servers'][$i]['ssl_verify'] = $ssl_verifies[$i - 1];
+    }
+    if (isset($ssl_cas[$i - 1])) {
+        $cfg['Servers'][$i]['ssl_ca'] = $ssl_cas[$i - 1];
+    }
+    if (isset($ssl_keys[$i - 1])) {
+        $cfg['Servers'][$i]['ssl_key'] = $ssl_keys[$i - 1];
+    }
+    if (isset($ssl_certs[$i - 1])) {
+        $cfg['Servers'][$i]['ssl_cert'] = $ssl_certs[$i - 1];
+    }
     $cfg['Servers'][$i]['host'] = $hosts[$i - 1];
     if (isset($verbose[$i - 1])) {
         $cfg['Servers'][$i]['verbose'] = $verbose[$i - 1];
@@ -126,9 +207,10 @@ for ($i = 1; isset($hosts[$i - 1]); $i++) {
     $cfg['Servers'][$i]['compress'] = false;
     $cfg['Servers'][$i]['AllowNoPassword'] = true;
 }
-for ($i = 1; isset($sockets[$i - 1]); $i++) {
+// Avoid overwriting the last server id $i, use another variable name
-    $cfg['Servers'][$i]['socket'] = $sockets[$i - 1];
+for ($socketHostId = 1; isset($sockets[$socketHostId - 1]); $socketHostId++) {
-    $cfg['Servers'][$i]['host'] = 'localhost';
+    $cfg['Servers'][$socketHostId]['socket'] = $sockets[$socketHostId - 1];
+    $cfg['Servers'][$socketHostId]['host'] = 'localhost';
 }
 /*
  * Revert back to last configured server to make
@@ -137,9 +219,13 @@ for ($i = 1; isset($sockets[$i - 1]); $i++) {
 $i--;
 
 /* Uploads setup */
-$cfg['UploadDir'] = '';
+if (isset($_ENV['PMA_UPLOADDIR'])) {
-$cfg['SaveDir'] = '';
+    $cfg['UploadDir'] = $_ENV['PMA_UPLOADDIR'];
-$cfg['TempDir'] = '/tmp';
+}
+
+if (isset($_ENV['PMA_SAVEDIR'])) {
+    $cfg['SaveDir'] = $_ENV['PMA_SAVEDIR'];
+}
 
 if (isset($_ENV['MAX_EXECUTION_TIME'])) {
     $cfg['ExecTimeLimit'] = $_ENV['MAX_EXECUTION_TIME'];
@@ -151,5 +237,12 @@ if (isset($_ENV['MEMORY_LIMIT'])) {
 
 /* Include User Defined Settings Hook */
 if (file_exists('/config/phpmyadmin/config.user.inc.php')) {
-    include('/config/phpmyadmin/config.user.inc.php');
+    include '/config/phpmyadmin/config.user.inc.php';
+}
+
+/* Support additional configurations */
+if (is_dir('/config/phpmyadmin/conf.d/')) {
+    foreach (glob('/config/phpmyadmin/conf.d/*.php') as $filename) {
+        include $filename;
+    }
 }

root/defaults/helpers.php

@@ -0,0 +1,53 @@
+<?php
+
+// Sourced from https://github.com/phpmyadmin/docker/blob/master/helpers.php
+
+declare(strict_types=1);
+
+/**
+ * Helper function to decode and save multiple SSL files from base64.
+ *
+ * @param string $base64FilesContents The base64 encoded string containing multiple files separated by commas.
+ *                                    If no commas are present, the entire string is treated as a single file.
+ * @param string $prefix              The prefix to use for the generated file names.
+ * @param string $extension           The file extension to use for the generated files.
+ * @param string $storageFolder       The folder where to store the generated files.
+ *
+ * @return string A comma-separated list of paths to the generated files.
+ */
+function decodeBase64AndSaveFiles(string $base64FilesContents, string $prefix, string $extension, string $storageFolder): string
+{
+    // Ensure the output directory exists
+    if (! is_dir($storageFolder)) {
+        mkdir($storageFolder, 0755, true);
+    }
+
+    // Split the base64 string into an array of files
+    $base64FilesContents = explode(',', trim($base64FilesContents));
+    $counter = 1;
+    $outputFiles = [];
+
+    // Process each file
+    foreach ($base64FilesContents as $base64FileContent) {
+        $outputFile = $storageFolder . '/' . $prefix . '-' . $counter . '.' . $extension;
+
+        $fileContent = base64_decode($base64FileContent, true);
+        if ($fileContent === false) {
+            echo 'Failed to decode: ' . $base64FileContent;
+            exit(1);
+        }
+
+        // Write the decoded file to the output directory
+        if (file_put_contents($outputFile, $fileContent) === false) {
+            echo 'Failed to write to ' . $outputFile;
+            exit(1);
+        }
+
+        // Add the output file path to the list
+        $outputFiles[] = $outputFile;
+        $counter++;
+    }
+
+    // Return a comma-separated list of the generated file paths
+    return implode(',', $outputFiles);
+}

root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run

@@ -27,6 +27,10 @@ if [[ ! -f /config/phpmyadmin/config.inc.php ]]; then
     cp /defaults/config.inc.php /config/phpmyadmin/config.inc.php
 fi
 
+if [[ ! -f /config/phpmyadmin/helpers.php ]]; then
+    cp /defaults/helpers.php /config/phpmyadmin/helpers.php
+fi
+
 if [[ -z ${LSIO_READ_ONLY_FS} ]] && [[ -z ${LSIO_NON_ROOT_USER} ]]; then
     # Set up themes
     if [[ -d "/config/themes" && ! -L "/app/www/public/themes" ]]; then