From 958d41ac94bdb9b19f0234ef62bf0bf8a95174b2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 6 Dec 2024 21:35:13 +0000 Subject: [PATCH 01/85] Bot Updating Templated Files --- Jenkinsfile | 268 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 176 insertions(+), 92 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dbd93e2..4753d93 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { } // Input to determine if this is a package check parameters { - string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') + string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') } // Configuration for the variables used for this specific repo environment { @@ -194,6 +194,7 @@ pipeline { env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER 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' } } } @@ -218,6 +219,7 @@ pipeline { env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA 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' } } } @@ -242,6 +244,7 @@ pipeline { env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN 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' } } } @@ -338,6 +341,35 @@ pipeline { else echo "No templates to delete" fi + echo "Starting Stage 2.5 - Update init diagram" + if ! grep -q 'init_diagram:' readme-vars.yml; then + echo "Adding the key 'init_diagram' to readme-vars.yml" + sed -i '\\|^#.*changelog.*$|d' readme-vars.yml + sed -i 's|^changelogs:|# init diagram\\ninit_diagram:\\n\\n# changelog\\nchangelogs:|' readme-vars.yml + fi + mkdir -p ${TEMPDIR}/d2 + docker run --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) -e RAW="true" ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:latest + ls -al ${TEMPDIR}/d2 + yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-latest.d2\\")" readme-vars.yml + if [[ $(md5sum readme-vars.yml | cut -c1-8) != $(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml | cut -c1-8) ]]; then + echo "'init_diagram' has been updated. Updating repo and exiting build, new one will trigger based on commit." + mkdir -p ${TEMPDIR}/repo + git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} + cd ${TEMPDIR}/repo/${LS_REPO} + git checkout -f main + cp ${WORKSPACE}/readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/readme-vars.yml + git add readme-vars.yml + git commit -m 'Bot Updating Templated Files' + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git main + echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating templates and exiting build, new one will trigger based on commit" + rm -Rf ${TEMPDIR} + exit 0 + else + echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Init diagram is unchanged" + fi echo "Starting Stage 3 - Update templates" CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} @@ -546,8 +578,40 @@ pipeline { --label \"org.opencontainers.image.title=Phpmyadmin\" \ --label \"org.opencontainers.image.description=[Phpmyadmin](https://github.com/phpmyadmin/phpmyadmin/) is a free software tool written in PHP, intended to handle the administration of MySQL over the Web. phpMyAdmin supports a wide range of operations on MySQL and MariaDB. \" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false \ + --provenance=false --sbom=false --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh '''#! /bin/bash + set -e + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker tag ${IMAGE}:${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + done + ''' + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' + ] + ]) { + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin + 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 + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & + done + wait + fi + ''' + } + } } } // Build MultiArch Docker containers for push to LS Repo @@ -578,8 +642,40 @@ pipeline { --label \"org.opencontainers.image.title=Phpmyadmin\" \ --label \"org.opencontainers.image.description=[Phpmyadmin](https://github.com/phpmyadmin/phpmyadmin/) is a free software tool written in PHP, intended to handle the administration of MySQL over the Web. phpMyAdmin supports a wide range of operations on MySQL and MariaDB. \" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false \ + --provenance=false --sbom=false --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh '''#! /bin/bash + set -e + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker tag ${IMAGE}:amd64-${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + done + ''' + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' + ] + ]) { + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin + 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 + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & + done + wait + fi + ''' + } + } } } stage('Build ARM64') { @@ -588,10 +684,6 @@ pipeline { } steps { echo "Running on node: ${NODE_NAME}" - echo 'Logging into Github' - sh '''#! /bin/bash - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - ''' sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64" sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ @@ -607,18 +699,47 @@ pipeline { --label \"org.opencontainers.image.title=Phpmyadmin\" \ --label \"org.opencontainers.image.description=[Phpmyadmin](https://github.com/phpmyadmin/phpmyadmin/) is a free software tool written in PHP, intended to handle the administration of MySQL over the Web. phpMyAdmin supports a wide range of operations on MySQL and MariaDB. \" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ - --provenance=false --sbom=false \ + --provenance=false --sbom=false --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - retry_backoff(5,5) { - sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + sh '''#! /bin/bash + set -e + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker tag ${IMAGE}:arm64v8-${META_TAG} ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + done + ''' + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' + ] + ]) { + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin + 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 + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} & + done + wait + fi + ''' + } } sh '''#! /bin/bash containers=$(docker ps -aq) if [[ -n "${containers}" ]]; then docker stop ${containers} fi - docker system prune -af --volumes || : ''' + docker system prune -af --volumes || : + ''' } } } @@ -768,37 +889,23 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' - ] - ]) { - retry_backoff(5,5) { - sh '''#! /bin/bash - set -e - echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin - 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 - for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do - docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} - fi - docker push ${PUSHIMAGE}:latest - docker push ${PUSHIMAGE}:${META_TAG} - docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker push ${PUSHIMAGE}:${SEMVER} - fi + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + for PUSHIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + [[ ${PUSHIMAGE%%/*} =~ \\. ]] && PUSHIMAGEPLUS="${PUSHIMAGE}" || PUSHIMAGEPLUS="docker.io/${PUSHIMAGE}" + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + if [[ "${PUSHIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then + 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} + if [ -n "${SEMVER}" ]; then + docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + fi + done + ''' } } } @@ -809,57 +916,34 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' - ] - ]) { - retry_backoff(5,5) { - sh '''#! /bin/bash - set -e - echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin - 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 [ "${CI}" == "false" ]; 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} - fi - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - fi - docker push ${MANIFESTIMAGE}:amd64-${META_TAG} - docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} - docker push ${MANIFESTIMAGE}:amd64-latest - docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:arm64v8-latest - docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker push ${MANIFESTIMAGE}:amd64-${SEMVER} - docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} - 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}:${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 [ -n "${SEMVER}" ]; then - docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - fi + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}" + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then + 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}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + 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}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + 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}:${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 [ -n "${SEMVER}" ]; then + docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + fi + done + ''' } } } From 355cd40e41d8a330572e29154d6f4a52c12ca3e3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 6 Dec 2024 21:36:54 +0000 Subject: [PATCH 02/85] Bot Updating Templated Files --- readme-vars.yml | 100 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 73 insertions(+), 27 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index ed33831..7ea10d8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -6,33 +6,25 @@ project_url: "https://github.com/phpmyadmin/phpmyadmin/" project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/phpmyadmin-logo.png" project_blurb: | [{{ project_name|capitalize }}]({{ project_url }}) is a free software tool written in PHP, intended to handle the administration of MySQL over the Web. phpMyAdmin supports a wide range of operations on MySQL and MariaDB. - project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" - # supported architectures available_architectures: - - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} - - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} - + - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} + - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"} # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" - param_usage_include_env: false - opt_param_usage_include_env: true opt_param_env_vars: - - { env_var: "PMA_ARBITRARY", env_value: "1", desc: "Set to `1` to allow you to connect to any server. Setting to `0` will only allow you to connect to specified hosts (See Application Setup)"} - - { env_var: "PMA_ABSOLUTE_URI", env_value: "https://phpmyadmin.example.com", desc: "Set the URL you will use to access the web frontend"} - + - {env_var: "PMA_ARBITRARY", env_value: "1", desc: "Set to `1` to allow you to connect to any server. Setting to `0` will only allow you to connect to specified hosts (See Application Setup)"} + - {env_var: "PMA_ABSOLUTE_URI", env_value: "https://phpmyadmin.example.com", desc: "Set the URL you will use to access the web frontend"} param_usage_include_ports: true param_ports: - - { external_port: "80", internal_port: "80", port_desc: "Port for web frontend" } - + - {external_port: "80", internal_port: "80", port_desc: "Port for web frontend"} param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } - + - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files"} # application setup block app_setup_block_enabled: true app_setup_block: | @@ -41,18 +33,72 @@ app_setup_block: | We support all of the official [environment variables](https://docs.phpmyadmin.net/en/latest/setup.html#docker-environment-variables) for configuration as well as directly editing the config files. For more information check out the [phpmyadmin documentation](https://www.phpmyadmin.net/docs/). - +# init diagram +init_diagram: | + "phpmyadmin:latest": { + docker-mods + base { + fix-attr +\nlegacy cont-init + } + docker-mods -> base + legacy-services + custom services + init-services -> legacy-services + init-services -> custom services + custom services -> legacy-services + legacy-services -> ci-service-check + init-migrations -> init-adduser + init-nginx-end -> init-config + init-os-end -> init-config + init-config -> init-config-end + init-phpmyadmin-config -> init-config-end + init-os-end -> init-crontab-config + init-mods-end -> init-custom-files + base -> init-envfile + init-os-end -> init-folders + init-php -> init-keygen + base -> init-migrations + base -> init-mods + init-config-end -> init-mods + init-version-checks -> init-mods + init-mods -> init-mods-end + init-mods-package-install -> init-mods-end + init-mods -> init-mods-package-install + init-samples -> init-nginx + init-permissions -> init-nginx-end + base -> init-os-end + init-adduser -> init-os-end + init-envfile -> init-os-end + init-migrations -> init-os-end + init-keygen -> init-permissions + init-nginx -> init-php + init-nginx-end -> init-phpmyadmin-config + init-folders -> init-samples + init-custom-files -> init-services + init-mods-end -> init-services + init-config-end -> init-version-checks + init-services -> svc-cron + svc-cron -> legacy-services + init-services -> svc-nginx + svc-nginx -> legacy-services + init-services -> svc-php-fpm + svc-php-fpm -> legacy-services + } + Base Images: { + "baseimage-alpine-nginx:3.20" <- "baseimage-alpine:3.20" + } + "phpmyadmin:latest" <- Base Images # changelog changelogs: - - { date: "27.05.24:", desc: "Existing users should update their nginx confs to avoid http2 deprecation warnings." } - - { date: "24.05.24:", desc: "Rebase to Alpine 3.20." } - - { date: "28.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3." } - - { date: "25.12.23:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } - - { date: "06.09.23:", desc: "Add support for custom themes." } - - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } - - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." } - - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." } - - { date: "18.11.22:", desc: "Rebasing to Alpine 3.16, migrate to s6v3." } - - { date: "20.08.22:", desc: "Rebasing to Alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." } - - { date: "23.01.22:", desc: "Pin versions to 5.x.x." } - - { date: "14.06.21:", desc: "Initial Release." } + - {date: "27.05.24:", desc: "Existing users should update their nginx confs to avoid http2 deprecation warnings."} + - {date: "24.05.24:", desc: "Rebase to Alpine 3.20."} + - {date: "28.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} + - {date: "25.12.23:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf."} + - {date: "06.09.23:", desc: "Add support for custom themes."} + - {date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf."} + - {date: "13.04.23:", desc: "Move ssl.conf include to default.conf."} + - {date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1."} + - {date: "18.11.22:", desc: "Rebasing to Alpine 3.16, migrate to s6v3."} + - {date: "20.08.22:", desc: "Rebasing to Alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))."} + - {date: "23.01.22:", desc: "Pin versions to 5.x.x."} + - {date: "14.06.21:", desc: "Initial Release."} From 6600779a3e8a56ca14e404dbccf77124e1d92444 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 6 Dec 2024 21:38:32 +0000 Subject: [PATCH 03/85] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 22 ++++++++++++---------- README.md | 6 ++++-- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 3997224..c37563b 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -43,16 +43,18 @@ jobs: token=$(curl -sX GET \ "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fphpmyadmin%3Apull" \ | jq -r '.token') - multidigest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/manifests/${tag}" \ - | jq -r 'first(.manifests[].digest)') - digest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ - | jq -r '.config.digest') + multidigest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Accept: application/vnd.oci.image.index.v1+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${tag}") + multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}") + digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Accept: application/vnd.oci.image.manifest.v1+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ + | jq -r '.config.digest') image_info=$(curl -sL \ --header "Authorization: Bearer ${token}" \ "https://ghcr.io/v2/${image}/blobs/${digest}") diff --git a/README.md b/README.md index 9761983..03aac76 100644 --- a/README.md +++ b/README.md @@ -65,11 +65,13 @@ We support all of the official [environment variables](https://docs.phpmyadmin.n For more information check out the [phpmyadmin documentation](https://www.phpmyadmin.net/docs/). - ## Usage To help you get started creating a container from this image you can either use docker-compose or the docker cli. +>[!NOTE] +>Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided. + ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose)) ```yaml @@ -113,7 +115,7 @@ Containers are configured using parameters passed at runtime (such as those abov | Parameter | Function | | :----: | --- | -| `-p 80` | Port for web frontend | +| `-p 80:80` | Port for web frontend | | `-e PUID=1000` | for UserID - see below for explanation | | `-e PGID=1000` | for GroupID - see below for explanation | | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). | From 807349cc65247482d2a2c4c446b24a0587022644 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 13 Dec 2024 21:35:30 +0000 Subject: [PATCH 04/85] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f19b2f7..087eeef 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ alpine-keys 2.4-r1 apk alpine-release 3.20.3-r0 apk aom-libs 3.9.1-r0 apk apache2-utils 2.4.62-r0 apk -apk-tools 2.14.4-r0 apk +apk-tools 2.14.4-r1 apk apr 1.7.5-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk @@ -21,13 +21,13 @@ ca-certificates 20240705-r0 apk ca-certificates-bundle 20240705-r0 apk catatonit 0.2.0-r0 apk code-lts/u2f-php-server v1.2.1 php-composer -composer 2.8.3 binary +composer 2.8.4 binary composer/ca-bundle 1.3.5 php-composer coreutils 9.5-r1 apk coreutils-env 9.5-r1 apk coreutils-fmt 9.5-r1 apk coreutils-sha512sum 9.5-r1 apk -curl 8.9.1-r2 apk +curl 8.11.0-r2 apk dasprid/enum 1.0.3 php-composer fgrosse/phpasn1 v2.5.0 php-composer fig/http-message-util 1.1.5 php-composer @@ -45,7 +45,7 @@ libavif 1.0.4-r0 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.3.2-r1 apk -libcurl 8.9.1-r2 apk +libcurl 8.11.0-r2 apk libdav1d 1.4.2-r0 apk libedit 20240517.3.1-r0 apk libexpat 2.6.4-r0 apk @@ -55,7 +55,7 @@ libidn2 2.3.7-r0 apk libintl 0.22.5-r0 apk libjpeg-turbo 3.0.3-r0 apk libmd 1.1.0-r0 apk -libncursesw 6.4_p20240420-r1 apk +libncursesw 6.4_p20240420-r2 apk libpng 1.6.44-r0 apk libproc2 4.0.4-r0 apk libpsl 0.21.5-r1 apk @@ -79,7 +79,7 @@ logrotate 3.21.0-r1 apk musl 1.2.5-r0 apk musl-utils 1.2.5-r0 apk nano 8.0-r0 apk -ncurses-terminfo-base 6.4_p20240420-r1 apk +ncurses-terminfo-base 6.4_p20240420-r2 apk netcat-openbsd 1.226-r0 apk nghttp2-libs 1.62.1-r0 apk nginx 1.26.2-r0 apk From c931d11c35055925286e2882aff2a2e9d523c44b Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 20 Dec 2024 15:55:06 +0000 Subject: [PATCH 05/85] Rebase to 3.21 --- .github/workflows/external_trigger.yml | 33 ++++++++++++++----- .../workflows/package_trigger_scheduler.yml | 27 ++++++++++++--- Dockerfile | 8 ++--- Dockerfile.aarch64 | 8 ++--- Jenkinsfile | 18 ++++++---- README.md | 20 +++++++++++ readme-vars.yml | 8 +++++ root/defaults/config.inc.php | 1 + .../s6-rc.d/init-phpmyadmin-config/run | 33 ++++++++++--------- 9 files changed, 113 insertions(+), 43 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index c37563b..c14d469 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -48,13 +48,30 @@ jobs: --header "Accept: application/vnd.oci.image.index.v1+json" \ --header "Authorization: Bearer ${token}" \ "https://ghcr.io/v2/${image}/manifests/${tag}") - multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}") - digest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Accept: application/vnd.oci.image.manifest.v1+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/${image}/manifests/${multidigest}" \ - | jq -r '.config.digest') + if jq -e '.layers // empty' <<< "${multidigest}" >/dev/null 2>&1; then + # If there's a layer element it's a single-arch manifest so just get that digest + digest=$(jq -r '.config.digest' <<< "${multidigest}") + else + # Otherwise it's multi-arch or has manifest annotations + if jq -e '.manifests[]?.annotations // empty' <<< "${multidigest}" >/dev/null 2>&1; then + # Check for manifest annotations and delete if found + multidigest=$(jq 'del(.manifests[] | select(.annotations))' <<< "${multidigest}") + fi + if [[ $(jq '.manifests | length' <<< "${multidigest}") -gt 1 ]]; then + # If there's still more than one digest, it's multi-arch + multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}") + else + # Otherwise it's single arch + multidigest=$(jq -r ".manifests[].digest?" <<< "${multidigest}") + fi + if digest=$(curl -s \ + --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ + --header "Accept: application/vnd.oci.image.manifest.v1+json" \ + --header "Authorization: Bearer ${token}" \ + "https://ghcr.io/v2/${image}/manifests/${multidigest}"); then + digest=$(jq -r '.config.digest' <<< "${digest}"); + fi + fi image_info=$(curl -sL \ --header "Authorization: Bearer ${token}" \ "https://ghcr.io/v2/${image}/blobs/${digest}") @@ -92,7 +109,7 @@ jobs: else printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY - if "${artifacts_found}" == "true" ]]; then + if [[ "${artifacts_found}" == "true" ]]; then echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY fi response=$(curl -iX POST \ diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index ccf441c..a28c125 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -27,9 +27,18 @@ jobs: fi printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-phpmyadmin/${br}/jenkins-vars.yml) - if [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then + if ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-phpmyadmin/${br}/Jenkinsfile >/dev/null 2>&1; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> No Jenkinsfile found. Branch is either deprecated or is an early dev branch." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY - if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then + README_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-phpmyadmin/${br}/readme-vars.yml) + if [[ $(yq -r '.project_deprecation_status' <<< "${README_VARS}") == "true" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Branch appears to be deprecated; skipping trigger." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " @@ -37,7 +46,7 @@ jobs: echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`phpmyadmin_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " - elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-phpmyadmin/job/${br}/lastBuild/api/json | jq -r '.building') == "true" ]; then + elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-phpmyadmin/job/${br}/lastBuild/api/json | jq -r '.building' 2>/dev/null) == "true" ]; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " @@ -49,6 +58,11 @@ jobs: response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-phpmyadmin/job/${br}/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + if [[ -z "${response}" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Jenkins build could not be triggered. Skipping branch." + continue + fi echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY sleep 10 @@ -56,11 +70,14 @@ jobs: buildurl="${buildurl%$'\r'}" echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY - curl -iX POST \ + if ! curl -ifX POST \ "${buildurl}submitDescription" \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ - --data-urlencode "Submit=Submit" + --data-urlencode "Submit=Submit"; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Unable to change the Jenkins job description." + fi sleep 20 fi else diff --git a/Dockerfile b/Dockerfile index 3cad6ff..36b5947 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.21 # set version label ARG BUILD_DATE @@ -11,9 +11,9 @@ LABEL maintainer="thespad" # environment settings ARG PHPMYADMIN_RELEASE_GPG_KEY="3D06A59ECE730EB71B511C17CE752F178259BD92" -ENV MAX_EXECUTION_TIME 600 -ENV MEMORY_LIMIT 512M -ENV UPLOAD_LIMIT 8192K +ENV MAX_EXECUTION_TIME=600 +ENV MEMORY_LIMIT=512M +ENV UPLOAD_LIMIT=8192K RUN \ apk add --no-cache --virtual=build-dependencies \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 9ad7aa0..a501e4f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.21 # set version label ARG BUILD_DATE @@ -11,9 +11,9 @@ LABEL maintainer="thespad" # environment settings ARG PHPMYADMIN_RELEASE_GPG_KEY="3D06A59ECE730EB71B511C17CE752F178259BD92" -ENV MAX_EXECUTION_TIME 600 -ENV MEMORY_LIMIT 512M -ENV UPLOAD_LIMIT 8192K +ENV MAX_EXECUTION_TIME=600 +ENV MEMORY_LIMIT=512M +ENV UPLOAD_LIMIT=8192K RUN \ apk add --no-cache --virtual=build-dependencies \ diff --git a/Jenkinsfile b/Jenkinsfile index 4753d93..a0d2d42 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -578,7 +578,7 @@ pipeline { --label \"org.opencontainers.image.title=Phpmyadmin\" \ --label \"org.opencontainers.image.description=[Phpmyadmin](https://github.com/phpmyadmin/phpmyadmin/) is a free software tool written in PHP, intended to handle the administration of MySQL over the Web. phpMyAdmin supports a wide range of operations on MySQL and MariaDB. \" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false --builder=container --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -607,7 +607,9 @@ pipeline { for i in "${CACHE[@]}"; do docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & done - wait + for p in $(jobs -p); do + wait "$p" || { echo "job $p failed" >&2; exit 1; } + done fi ''' } @@ -642,7 +644,7 @@ pipeline { --label \"org.opencontainers.image.title=Phpmyadmin\" \ --label \"org.opencontainers.image.description=[Phpmyadmin](https://github.com/phpmyadmin/phpmyadmin/) is a free software tool written in PHP, intended to handle the administration of MySQL over the Web. phpMyAdmin supports a wide range of operations on MySQL and MariaDB. \" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false --builder=container --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -671,7 +673,9 @@ pipeline { for i in "${CACHE[@]}"; do docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & done - wait + for p in $(jobs -p); do + wait "$p" || { echo "job $p failed" >&2; exit 1; } + done fi ''' } @@ -699,7 +703,7 @@ pipeline { --label \"org.opencontainers.image.title=Phpmyadmin\" \ --label \"org.opencontainers.image.description=[Phpmyadmin](https://github.com/phpmyadmin/phpmyadmin/) is a free software tool written in PHP, intended to handle the administration of MySQL over the Web. phpMyAdmin supports a wide range of operations on MySQL and MariaDB. \" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ - --provenance=false --sbom=false --builder=container --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -728,7 +732,9 @@ pipeline { for i in "${CACHE[@]}"; do docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} & done - wait + for p in $(jobs -p); do + wait "$p" || { echo "job $p failed" >&2; exit 1; } + done fi ''' } diff --git a/README.md b/README.md index 03aac76..04368dc 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,23 @@ We support all of the official [environment variables](https://docs.phpmyadmin.n For more information check out the [phpmyadmin documentation](https://www.phpmyadmin.net/docs/). +## Read-Only Operation + +This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/). + +### Caveats + +* Custom themes are not supported + +## Non-Root Operation + +This image can be run with a non-root user. For details please [read the docs](https://docs.linuxserver.io/misc/non-root/). + +### Caveats + +* `/tmp` must be mounted to tmpfs +* Custom themes are not supported + ## Usage To help you get started creating a container from this image you can either use docker-compose or the docker cli. @@ -122,6 +139,8 @@ Containers are configured using parameters passed at runtime (such as those abov | `-e PMA_ARBITRARY=1` | Set to `1` to allow you to connect to any server. Setting to `0` will only allow you to connect to specified hosts (See Application Setup) | | `-e PMA_ABSOLUTE_URI=https://phpmyadmin.example.com` | Set the URL you will use to access the web frontend | | `-v /config` | Persistent config files | +| `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). | +| `--user=1000:1000` | Run container with a non-root user. Please [read the docs](https://docs.linuxserver.io/misc/non-root/). | ## Environment variables from files (Docker secrets) @@ -285,6 +304,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **19.12.24:** - Rebase to Alpine 3.21. * **27.05.24:** - Existing users should update their nginx confs to avoid http2 deprecation warnings. * **24.05.24:** - Rebase to Alpine 3.20. * **28.12.23:** - Rebase to Alpine 3.19 with php 8.3. diff --git a/readme-vars.yml b/readme-vars.yml index 7ea10d8..bd37aa8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -26,6 +26,13 @@ param_usage_include_vols: true param_volumes: - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files"} # application setup block +readonly_supported: true +readonly_message: | + * Custom themes are not supported +nonroot_supported: true +nonroot_message: | + * `/tmp` must be mounted to tmpfs + * Custom themes are not supported app_setup_block_enabled: true app_setup_block: | This image uses nginx, in contrast to the official images which offer fpm-only or Apache variants. @@ -90,6 +97,7 @@ init_diagram: | "phpmyadmin:latest" <- Base Images # changelog changelogs: + - {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."} - {date: "24.05.24:", desc: "Rebase to Alpine 3.20."} - {date: "28.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} diff --git a/root/defaults/config.inc.php b/root/defaults/config.inc.php index c94aef8..703a05d 100644 --- a/root/defaults/config.inc.php +++ b/root/defaults/config.inc.php @@ -139,6 +139,7 @@ /* Uploads setup */ $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; +$cfg['TempDir'] = '/tmp'; if (isset($_ENV['MAX_EXECUTION_TIME'])) { $cfg['ExecTimeLimit'] = $_ENV['MAX_EXECUTION_TIME']; diff --git a/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run b/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run index 09d2f40..2c6ebbd 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-phpmyadmin-config/run @@ -2,8 +2,7 @@ # shellcheck shell=bash mkdir -p \ - /config/phpmyadmin \ - /app/www/public/tmp + /config/phpmyadmin if [[ ! -f /config/phpmyadmin/config.secret.inc.php ]]; then cat >/config/phpmyadmin/config.secret.inc.php < Date: Fri, 20 Dec 2024 16:18:20 +0000 Subject: [PATCH 06/85] Bot Updating Templated Files --- readme-vars.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/readme-vars.yml b/readme-vars.yml index bd37aa8..ff5e004 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -58,32 +58,27 @@ init_diagram: | init-nginx-end -> init-config init-os-end -> init-config init-config -> init-config-end + init-crontab-config -> init-config-end init-phpmyadmin-config -> init-config-end - init-os-end -> init-crontab-config + init-config -> init-crontab-config init-mods-end -> init-custom-files base -> init-envfile init-os-end -> init-folders init-php -> init-keygen base -> init-migrations - base -> init-mods init-config-end -> init-mods - init-version-checks -> init-mods - init-mods -> init-mods-end init-mods-package-install -> init-mods-end init-mods -> init-mods-package-install init-samples -> init-nginx - init-permissions -> init-nginx-end - base -> init-os-end + init-version-checks -> init-nginx-end init-adduser -> init-os-end init-envfile -> init-os-end - init-migrations -> init-os-end init-keygen -> init-permissions init-nginx -> init-php init-nginx-end -> init-phpmyadmin-config init-folders -> init-samples init-custom-files -> init-services - init-mods-end -> init-services - init-config-end -> init-version-checks + init-permissions -> init-version-checks init-services -> svc-cron svc-cron -> legacy-services init-services -> svc-nginx @@ -92,7 +87,7 @@ init_diagram: | svc-php-fpm -> legacy-services } Base Images: { - "baseimage-alpine-nginx:3.20" <- "baseimage-alpine:3.20" + "baseimage-alpine-nginx:3.21" <- "baseimage-alpine:3.21" } "phpmyadmin:latest" <- Base Images # changelog From 2804850cacb1132e94a92f80c21adc71899a8826 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 20 Dec 2024 16:22:43 +0000 Subject: [PATCH 07/85] Bot Updating Package Versions --- package_versions.txt | 340 +++++++++++++++++++++---------------------- 1 file changed, 170 insertions(+), 170 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 087eeef..03cda8d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,170 +1,170 @@ -NAME VERSION TYPE -alpine-baselayout 3.6.5-r0 apk -alpine-baselayout-data 3.6.5-r0 apk -alpine-keys 2.4-r1 apk -alpine-release 3.20.3-r0 apk -aom-libs 3.9.1-r0 apk -apache2-utils 2.4.62-r0 apk -apk-tools 2.14.4-r1 apk -apr 1.7.5-r0 apk -apr-util 1.6.3-r1 apk -argon2-libs 20190702-r5 apk -bacon/bacon-qr-code 2.0.8 php-composer -bash 5.2.26-r0 apk -beberlei/assert v3.3.2 php-composer -brick/math 0.8.17 php-composer -brotli-libs 1.1.0-r2 apk -busybox 1.36.1-r29 apk -busybox-binsh 1.36.1-r29 apk -c-ares 1.33.1-r0 apk -ca-certificates 20240705-r0 apk -ca-certificates-bundle 20240705-r0 apk -catatonit 0.2.0-r0 apk -code-lts/u2f-php-server v1.2.1 php-composer -composer 2.8.4 binary -composer/ca-bundle 1.3.5 php-composer -coreutils 9.5-r1 apk -coreutils-env 9.5-r1 apk -coreutils-fmt 9.5-r1 apk -coreutils-sha512sum 9.5-r1 apk -curl 8.11.0-r2 apk -dasprid/enum 1.0.3 php-composer -fgrosse/phpasn1 v2.5.0 php-composer -fig/http-message-util 1.1.5 php-composer -findutils 4.9.0-r5 apk -freetype 2.13.2-r0 apk -git 2.45.2-r0 apk -git-init-template 2.45.2-r0 apk -google/recaptcha 1.2.4 php-composer -jq 1.7.1-r0 apk -league/uri 6.4.0 php-composer -league/uri-interfaces 2.3.0 php-composer -libacl 2.3.2-r0 apk -libattr 2.5.2-r0 apk -libavif 1.0.4-r0 apk -libbsd 0.12.2-r0 apk -libbz2 1.0.8-r6 apk -libcrypto3 3.3.2-r1 apk -libcurl 8.11.0-r2 apk -libdav1d 1.4.2-r0 apk -libedit 20240517.3.1-r0 apk -libexpat 2.6.4-r0 apk -libgcc 13.2.1_git20240309-r0 apk -libice 1.1.1-r6 apk -libidn2 2.3.7-r0 apk -libintl 0.22.5-r0 apk -libjpeg-turbo 3.0.3-r0 apk -libmd 1.1.0-r0 apk -libncursesw 6.4_p20240420-r2 apk -libpng 1.6.44-r0 apk -libproc2 4.0.4-r0 apk -libpsl 0.21.5-r1 apk -libsharpyuv 1.3.2-r0 apk -libsm 1.2.4-r4 apk -libssl3 3.3.2-r1 apk -libunistring 1.2-r0 apk -libuuid 2.40.1-r1 apk -libwebp 1.3.2-r0 apk -libx11 1.8.9-r1 apk -libxau 1.0.11-r4 apk -libxcb 1.16.1-r0 apk -libxdmcp 1.1.5-r1 apk -libxext 1.3.6-r2 apk -libxml2 2.12.7-r0 apk -libxpm 3.5.17-r0 apk -libxt 1.3.0-r5 apk -libzip 1.10.1-r0 apk -linux-pam 1.6.0-r0 apk -logrotate 3.21.0-r1 apk -musl 1.2.5-r0 apk -musl-utils 1.2.5-r0 apk -nano 8.0-r0 apk -ncurses-terminfo-base 6.4_p20240420-r2 apk -netcat-openbsd 1.226-r0 apk -nghttp2-libs 1.62.1-r0 apk -nginx 1.26.2-r0 apk -nikic/fast-route v1.3.0 php-composer -oniguruma 6.9.9-r0 apk -openssl 3.3.2-r1 apk -paragonie/constant_time_encoding v2.6.3 php-composer -paragonie/random_compat v9.99.100 php-composer -paragonie/sodium_compat v1.19.0 php-composer -pcre 8.45-r3 apk -pcre2 10.43-r0 apk -php83 8.3.14-r0 apk -php83-bz2 8.3.14-r0 apk -php83-common 8.3.14-r0 apk -php83-ctype 8.3.14-r0 apk -php83-curl 8.3.14-r0 apk -php83-dom 8.3.14-r0 apk -php83-fileinfo 8.3.14-r0 apk -php83-fpm 8.3.14-r0 apk -php83-gd 8.3.14-r0 apk -php83-iconv 8.3.14-r0 apk -php83-mbstring 8.3.14-r0 apk -php83-mysqli 8.3.14-r0 apk -php83-mysqlnd 8.3.14-r0 apk -php83-opcache 8.3.14-r0 apk -php83-openssl 8.3.14-r0 apk -php83-pecl-uploadprogress 2.0.2-r1 apk -php83-phar 8.3.14-r0 apk -php83-session 8.3.14-r0 apk -php83-simplexml 8.3.14-r0 apk -php83-tokenizer 8.3.14-r0 apk -php83-xml 8.3.14-r0 apk -php83-xmlwriter 8.3.14-r0 apk -php83-zip 8.3.14-r0 apk -phpmyadmin 5.2.1 npm -phpmyadmin/motranslator 5.3.0 php-composer -phpmyadmin/shapefile 3.0.1 php-composer -phpmyadmin/sql-parser 5.7.0 php-composer -phpmyadmin/twig-i18n-extension v4.0.1 php-composer -popt 1.19-r3 apk -pragmarx/google2fa v8.0.1 php-composer -pragmarx/google2fa-qrcode v2.1.1 php-composer -procps-ng 4.0.4-r0 apk -psr/cache 1.0.1 php-composer -psr/container 1.1.1 php-composer -psr/http-client 1.0.1 php-composer -psr/http-factory 1.0.1 php-composer -psr/http-message 1.0.1 php-composer -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.10-r0 apk -scanelf 1.3.7-r2 apk -shadow 4.15.1-r0 apk -skalibs 2.14.1.1-r0 apk -slim/psr7 1.4 php-composer -spomky-labs/base64url v2.0.4 php-composer -spomky-labs/cbor-php v1.1.1 php-composer -ssl_client 1.36.1-r29 apk -symfony/cache v5.4.19 php-composer -symfony/cache-contracts v2.5.2 php-composer -symfony/config v5.4.19 php-composer -symfony/dependency-injection v5.4.20 php-composer -symfony/deprecation-contracts v2.5.2 php-composer -symfony/expression-language v5.4.19 php-composer -symfony/filesystem v5.4.19 php-composer -symfony/polyfill-ctype v1.27.0 php-composer -symfony/polyfill-mbstring v1.27.0 php-composer -symfony/polyfill-php73 v1.27.0 php-composer -symfony/polyfill-php80 v1.27.0 php-composer -symfony/polyfill-php81 v1.27.0 php-composer -symfony/process v5.4.19 php-composer -symfony/service-contracts v2.5.2 php-composer -symfony/var-exporter v5.4.19 php-composer -tecnickcom/tcpdf 6.6.2 php-composer -thecodingmachine/safe v1.3.3 php-composer -twig/twig v3.5.0 php-composer -tzdata 2024b-r0 apk -utmps-libs 0.1.2.2-r1 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.2.14 php-composer -xz-libs 5.6.2-r0 apk -zlib 1.3.1-r1 apk -zstd-libs 1.5.6-r0 apk +NAME VERSION TYPE +acl-libs 2.3.2-r1 apk +alpine-baselayout 3.6.8-r0 apk +alpine-baselayout-data 3.6.8-r0 apk +alpine-keys 2.5-r0 apk +alpine-release 3.21.0-r0 apk +aom-libs 3.11.0-r0 apk +apache2-utils 2.4.62-r0 apk +apk-tools 2.14.6-r2 apk +apr 1.7.5-r0 apk +apr-util 1.6.3-r1 apk +argon2-libs 20190702-r5 apk +bacon/bacon-qr-code 2.0.8 php-composer +bash 5.2.37-r0 apk +beberlei/assert v3.3.2 php-composer +brick/math 0.8.17 php-composer +brotli-libs 1.1.0-r2 apk +busybox 1.37.0-r9 apk +busybox-binsh 1.37.0-r9 apk +c-ares 1.34.3-r0 apk +ca-certificates 20241010-r0 apk +ca-certificates-bundle 20241010-r0 apk +catatonit 0.2.0-r0 apk +code-lts/u2f-php-server v1.2.1 php-composer +composer 2.8.4 binary +composer/ca-bundle 1.3.5 php-composer +coreutils 9.5-r1 apk +coreutils-env 9.5-r1 apk +coreutils-fmt 9.5-r1 apk +coreutils-sha512sum 9.5-r1 apk +curl 8.11.1-r0 apk +dasprid/enum 1.0.3 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 +git 2.47.1-r0 apk +git-init-template 2.47.1-r0 apk +google/recaptcha 1.2.4 php-composer +jq 1.7.1-r0 apk +league/uri 6.4.0 php-composer +league/uri-interfaces 2.3.0 php-composer +libattr 2.5.2-r2 apk +libavif 1.0.4-r0 apk +libbsd 0.12.2-r0 apk +libbz2 1.0.8-r6 apk +libcrypto3 3.3.2-r4 apk +libcurl 8.11.1-r0 apk +libdav1d 1.5.0-r0 apk +libedit 20240808.3.1-r0 apk +libexpat 2.6.4-r0 apk +libgcc 14.2.0-r4 apk +libice 1.1.1-r6 apk +libidn2 2.3.7-r0 apk +libintl 0.22.5-r0 apk +libjpeg-turbo 3.0.4-r0 apk +libmd 1.1.0-r0 apk +libncursesw 6.5_p20241006-r3 apk +libpng 1.6.44-r0 apk +libproc2 4.0.4-r2 apk +libpsl 0.21.5-r3 apk +libsharpyuv 1.4.0-r0 apk +libsm 1.2.4-r4 apk +libssl3 3.3.2-r4 apk +libunistring 1.2-r0 apk +libuuid 2.40.2-r4 apk +libwebp 1.4.0-r0 apk +libx11 1.8.10-r0 apk +libxau 1.0.11-r4 apk +libxcb 1.16.1-r0 apk +libxdmcp 1.1.5-r1 apk +libxext 1.3.6-r2 apk +libxml2 2.13.4-r3 apk +libxpm 3.5.17-r0 apk +libxt 1.3.1-r0 apk +libzip 1.11.2-r0 apk +linux-pam 1.6.1-r1 apk +logrotate 3.21.0-r1 apk +musl 1.2.5-r8 apk +musl-utils 1.2.5-r8 apk +nano 8.2-r0 apk +ncurses-terminfo-base 6.5_p20241006-r3 apk +netcat-openbsd 1.226.1.1-r0 apk +nghttp2-libs 1.64.0-r0 apk +nginx 1.26.2-r3 apk +nikic/fast-route v1.3.0 php-composer +oniguruma 6.9.9-r0 apk +openssl 3.3.2-r4 apk +paragonie/constant_time_encoding v2.6.3 php-composer +paragonie/random_compat v9.99.100 php-composer +paragonie/sodium_compat v1.19.0 php-composer +pcre 8.45-r3 apk +pcre2 10.43-r0 apk +php83 8.3.15-r0 apk +php83-bz2 8.3.15-r0 apk +php83-common 8.3.15-r0 apk +php83-ctype 8.3.15-r0 apk +php83-curl 8.3.15-r0 apk +php83-dom 8.3.15-r0 apk +php83-fileinfo 8.3.15-r0 apk +php83-fpm 8.3.15-r0 apk +php83-gd 8.3.15-r0 apk +php83-iconv 8.3.15-r0 apk +php83-mbstring 8.3.15-r0 apk +php83-mysqli 8.3.15-r0 apk +php83-mysqlnd 8.3.15-r0 apk +php83-opcache 8.3.15-r0 apk +php83-openssl 8.3.15-r0 apk +php83-pecl-uploadprogress 2.0.2-r1 apk +php83-phar 8.3.15-r0 apk +php83-session 8.3.15-r0 apk +php83-simplexml 8.3.15-r0 apk +php83-tokenizer 8.3.15-r0 apk +php83-xml 8.3.15-r0 apk +php83-xmlwriter 8.3.15-r0 apk +php83-zip 8.3.15-r0 apk +phpmyadmin 5.2.1 npm +phpmyadmin/motranslator 5.3.0 php-composer +phpmyadmin/shapefile 3.0.1 php-composer +phpmyadmin/sql-parser 5.7.0 php-composer +phpmyadmin/twig-i18n-extension v4.0.1 php-composer +popt 1.19-r4 apk +pragmarx/google2fa v8.0.1 php-composer +pragmarx/google2fa-qrcode v2.1.1 php-composer +procps-ng 4.0.4-r2 apk +psr/cache 1.0.1 php-composer +psr/container 1.1.1 php-composer +psr/http-client 1.0.1 php-composer +psr/http-factory 1.0.1 php-composer +psr/http-message 1.0.1 php-composer +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-r0 apk +scanelf 1.3.8-r1 apk +shadow 4.16.0-r1 apk +skalibs-libs 2.14.3.0-r0 apk +slim/psr7 1.4 php-composer +spomky-labs/base64url v2.0.4 php-composer +spomky-labs/cbor-php v1.1.1 php-composer +ssl_client 1.37.0-r9 apk +symfony/cache v5.4.19 php-composer +symfony/cache-contracts v2.5.2 php-composer +symfony/config v5.4.19 php-composer +symfony/dependency-injection v5.4.20 php-composer +symfony/deprecation-contracts v2.5.2 php-composer +symfony/expression-language v5.4.19 php-composer +symfony/filesystem v5.4.19 php-composer +symfony/polyfill-ctype v1.27.0 php-composer +symfony/polyfill-mbstring v1.27.0 php-composer +symfony/polyfill-php73 v1.27.0 php-composer +symfony/polyfill-php80 v1.27.0 php-composer +symfony/polyfill-php81 v1.27.0 php-composer +symfony/process v5.4.19 php-composer +symfony/service-contracts v2.5.2 php-composer +symfony/var-exporter v5.4.19 php-composer +tecnickcom/tcpdf 6.6.2 php-composer +thecodingmachine/safe v1.3.3 php-composer +twig/twig v3.5.0 php-composer +tzdata 2024b-r1 apk +utmps-libs 0.1.2.3-r2 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.2.14 php-composer +xz-libs 5.6.3-r0 apk +zlib 1.3.1-r2 apk +zstd-libs 1.5.6-r1 apk From f1305d59104a74eb89c4c26aa74afe43aefb8d7a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 3 Jan 2025 21:34:02 +0000 Subject: [PATCH 08/85] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 03cda8d..f0a7bdc 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -82,7 +82,7 @@ nano 8.2-r0 apk ncurses-terminfo-base 6.5_p20241006-r3 apk netcat-openbsd 1.226.1.1-r0 apk nghttp2-libs 1.64.0-r0 apk -nginx 1.26.2-r3 apk +nginx 1.26.2-r4 apk nikic/fast-route v1.3.0 php-composer oniguruma 6.9.9-r0 apk openssl 3.3.2-r4 apk @@ -167,4 +167,4 @@ webmozart/assert 1.11.0 php-composer williamdes/mariadb-mysql-kbs v1.2.14 php-composer xz-libs 5.6.3-r0 apk zlib 1.3.1-r2 apk -zstd-libs 1.5.6-r1 apk +zstd-libs 1.5.6-r2 apk From 1c4555532851831e0cdb9b2aafabee6c18b4c7f8 Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 6 Jan 2025 16:28:05 +0000 Subject: [PATCH 09/85] Fix RO/Nonroot typo --- README.md | 2 +- readme-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 04368dc..45b2ff5 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,7 @@ This image can be run with a read-only container filesystem. For details please ### Caveats +* `/tmp` must be mounted to tmpfs * Custom themes are not supported ## Non-Root Operation @@ -79,7 +80,6 @@ This image can be run with a non-root user. For details please [read the docs](h ### Caveats -* `/tmp` must be mounted to tmpfs * Custom themes are not supported ## Usage diff --git a/readme-vars.yml b/readme-vars.yml index ff5e004..83dcd2f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -28,10 +28,10 @@ param_volumes: # application setup block readonly_supported: true readonly_message: | + * `/tmp` must be mounted to tmpfs * Custom themes are not supported nonroot_supported: true nonroot_message: | - * `/tmp` must be mounted to tmpfs * Custom themes are not supported app_setup_block_enabled: true app_setup_block: | From 08223dccb678e50c924b9820431b3468bb994f7f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Mon, 6 Jan 2025 16:30:59 +0000 Subject: [PATCH 10/85] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f0a7bdc..a7704c1 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ NAME VERSION TYPE acl-libs 2.3.2-r1 apk -alpine-baselayout 3.6.8-r0 apk -alpine-baselayout-data 3.6.8-r0 apk +alpine-baselayout 3.6.8-r1 apk +alpine-baselayout-data 3.6.8-r1 apk alpine-keys 2.5-r0 apk alpine-release 3.21.0-r0 apk aom-libs 3.11.0-r0 apk @@ -18,8 +18,8 @@ brotli-libs 1.1.0-r2 apk busybox 1.37.0-r9 apk busybox-binsh 1.37.0-r9 apk c-ares 1.34.3-r0 apk -ca-certificates 20241010-r0 apk -ca-certificates-bundle 20241010-r0 apk +ca-certificates 20241121-r0 apk +ca-certificates-bundle 20241121-r0 apk catatonit 0.2.0-r0 apk code-lts/u2f-php-server v1.2.1 php-composer composer 2.8.4 binary From 113b7f1c60a1eab4551c6c703c7a5d35baae5a0b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 17 Jan 2025 21:33:20 +0000 Subject: [PATCH 11/85] Bot Updating Package Versions --- package_versions.txt | 64 ++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a7704c1..9044dac 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ acl-libs 2.3.2-r1 apk alpine-baselayout 3.6.8-r1 apk alpine-baselayout-data 3.6.8-r1 apk alpine-keys 2.5-r0 apk -alpine-release 3.21.0-r0 apk +alpine-release 3.21.2-r0 apk aom-libs 3.11.0-r0 apk apache2-utils 2.4.62-r0 apk apk-tools 2.14.6-r2 apk @@ -18,24 +18,24 @@ brotli-libs 1.1.0-r2 apk busybox 1.37.0-r9 apk busybox-binsh 1.37.0-r9 apk c-ares 1.34.3-r0 apk -ca-certificates 20241121-r0 apk -ca-certificates-bundle 20241121-r0 apk +ca-certificates 20241121-r1 apk +ca-certificates-bundle 20241121-r1 apk catatonit 0.2.0-r0 apk code-lts/u2f-php-server v1.2.1 php-composer composer 2.8.4 binary composer/ca-bundle 1.3.5 php-composer -coreutils 9.5-r1 apk -coreutils-env 9.5-r1 apk -coreutils-fmt 9.5-r1 apk -coreutils-sha512sum 9.5-r1 apk +coreutils 9.5-r2 apk +coreutils-env 9.5-r2 apk +coreutils-fmt 9.5-r2 apk +coreutils-sha512sum 9.5-r2 apk curl 8.11.1-r0 apk dasprid/enum 1.0.3 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 -git 2.47.1-r0 apk -git-init-template 2.47.1-r0 apk +git 2.47.2-r0 apk +git-init-template 2.47.2-r0 apk google/recaptcha 1.2.4 php-composer jq 1.7.1-r0 apk league/uri 6.4.0 php-composer @@ -63,7 +63,7 @@ libsharpyuv 1.4.0-r0 apk libsm 1.2.4-r4 apk libssl3 3.3.2-r4 apk libunistring 1.2-r0 apk -libuuid 2.40.2-r4 apk +libuuid 2.40.4-r0 apk libwebp 1.4.0-r0 apk libx11 1.8.10-r0 apk libxau 1.0.11-r4 apk @@ -91,29 +91,29 @@ paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.19.0 php-composer pcre 8.45-r3 apk pcre2 10.43-r0 apk -php83 8.3.15-r0 apk -php83-bz2 8.3.15-r0 apk -php83-common 8.3.15-r0 apk -php83-ctype 8.3.15-r0 apk -php83-curl 8.3.15-r0 apk -php83-dom 8.3.15-r0 apk -php83-fileinfo 8.3.15-r0 apk -php83-fpm 8.3.15-r0 apk -php83-gd 8.3.15-r0 apk -php83-iconv 8.3.15-r0 apk -php83-mbstring 8.3.15-r0 apk -php83-mysqli 8.3.15-r0 apk -php83-mysqlnd 8.3.15-r0 apk -php83-opcache 8.3.15-r0 apk -php83-openssl 8.3.15-r0 apk +php83 8.3.16-r0 apk +php83-bz2 8.3.16-r0 apk +php83-common 8.3.16-r0 apk +php83-ctype 8.3.16-r0 apk +php83-curl 8.3.16-r0 apk +php83-dom 8.3.16-r0 apk +php83-fileinfo 8.3.16-r0 apk +php83-fpm 8.3.16-r0 apk +php83-gd 8.3.16-r0 apk +php83-iconv 8.3.16-r0 apk +php83-mbstring 8.3.16-r0 apk +php83-mysqli 8.3.16-r0 apk +php83-mysqlnd 8.3.16-r0 apk +php83-opcache 8.3.16-r0 apk +php83-openssl 8.3.16-r0 apk php83-pecl-uploadprogress 2.0.2-r1 apk -php83-phar 8.3.15-r0 apk -php83-session 8.3.15-r0 apk -php83-simplexml 8.3.15-r0 apk -php83-tokenizer 8.3.15-r0 apk -php83-xml 8.3.15-r0 apk -php83-xmlwriter 8.3.15-r0 apk -php83-zip 8.3.15-r0 apk +php83-phar 8.3.16-r0 apk +php83-session 8.3.16-r0 apk +php83-simplexml 8.3.16-r0 apk +php83-tokenizer 8.3.16-r0 apk +php83-xml 8.3.16-r0 apk +php83-xmlwriter 8.3.16-r0 apk +php83-zip 8.3.16-r0 apk phpmyadmin 5.2.1 npm phpmyadmin/motranslator 5.3.0 php-composer phpmyadmin/shapefile 3.0.1 php-composer From e3d04c99b80b4b8a070c7b5219b36ae1b5c96023 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 21 Jan 2025 20:48:50 +0000 Subject: [PATCH 12/85] Bot Updating Package Versions --- package_versions.txt | 74 ++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9044dac..a6d6435 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -12,24 +12,24 @@ apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk bacon/bacon-qr-code 2.0.8 php-composer bash 5.2.37-r0 apk -beberlei/assert v3.3.2 php-composer +beberlei/assert v3.3.3 php-composer brick/math 0.8.17 php-composer brotli-libs 1.1.0-r2 apk -busybox 1.37.0-r9 apk -busybox-binsh 1.37.0-r9 apk +busybox 1.37.0-r12 apk +busybox-binsh 1.37.0-r12 apk c-ares 1.34.3-r0 apk ca-certificates 20241121-r1 apk ca-certificates-bundle 20241121-r1 apk catatonit 0.2.0-r0 apk -code-lts/u2f-php-server v1.2.1 php-composer +code-lts/u2f-php-server v1.2.2 php-composer composer 2.8.4 binary -composer/ca-bundle 1.3.5 php-composer +composer/ca-bundle 1.5.5 php-composer coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk coreutils-fmt 9.5-r2 apk coreutils-sha512sum 9.5-r2 apk curl 8.11.1-r0 apk -dasprid/enum 1.0.3 php-composer +dasprid/enum 1.0.6 php-composer fgrosse/phpasn1 v2.5.0 php-composer fig/http-message-util 1.1.5 php-composer findutils 4.10.0-r0 apk @@ -86,9 +86,9 @@ nginx 1.26.2-r4 apk nikic/fast-route v1.3.0 php-composer oniguruma 6.9.9-r0 apk openssl 3.3.2-r4 apk -paragonie/constant_time_encoding v2.6.3 php-composer +paragonie/constant_time_encoding v2.7.0 php-composer paragonie/random_compat v9.99.100 php-composer -paragonie/sodium_compat v1.19.0 php-composer +paragonie/sodium_compat v1.21.1 php-composer pcre 8.45-r3 apk pcre2 10.43-r0 apk php83 8.3.16-r0 apk @@ -114,20 +114,20 @@ php83-tokenizer 8.3.16-r0 apk php83-xml 8.3.16-r0 apk php83-xmlwriter 8.3.16-r0 apk php83-zip 8.3.16-r0 apk -phpmyadmin 5.2.1 npm -phpmyadmin/motranslator 5.3.0 php-composer -phpmyadmin/shapefile 3.0.1 php-composer -phpmyadmin/sql-parser 5.7.0 php-composer -phpmyadmin/twig-i18n-extension v4.0.1 php-composer +phpmyadmin 5.2.2 npm +phpmyadmin/motranslator 5.3.1 php-composer +phpmyadmin/shapefile 3.0.2 php-composer +phpmyadmin/sql-parser 5.10.3 php-composer +phpmyadmin/twig-i18n-extension 4.1.3 php-composer popt 1.19-r4 apk -pragmarx/google2fa v8.0.1 php-composer +pragmarx/google2fa v8.0.3 php-composer pragmarx/google2fa-qrcode v2.1.1 php-composer procps-ng 4.0.4-r2 apk psr/cache 1.0.1 php-composer psr/container 1.1.1 php-composer -psr/http-client 1.0.1 php-composer -psr/http-factory 1.0.1 php-composer -psr/http-message 1.0.1 php-composer +psr/http-client 1.0.3 php-composer +psr/http-factory 1.1.0 php-composer +psr/http-message 1.1 php-composer psr/log 1.1.4 php-composer ralouphie/getallheaders 3.0.3 php-composer ramsey/collection 1.1.4 php-composer @@ -136,35 +136,35 @@ readline 8.2.13-r0 apk scanelf 1.3.8-r1 apk shadow 4.16.0-r1 apk skalibs-libs 2.14.3.0-r0 apk -slim/psr7 1.4 php-composer +slim/psr7 1.4.1 php-composer spomky-labs/base64url v2.0.4 php-composer spomky-labs/cbor-php v1.1.1 php-composer -ssl_client 1.37.0-r9 apk -symfony/cache v5.4.19 php-composer -symfony/cache-contracts v2.5.2 php-composer -symfony/config v5.4.19 php-composer -symfony/dependency-injection v5.4.20 php-composer -symfony/deprecation-contracts v2.5.2 php-composer -symfony/expression-language v5.4.19 php-composer -symfony/filesystem v5.4.19 php-composer -symfony/polyfill-ctype v1.27.0 php-composer -symfony/polyfill-mbstring v1.27.0 php-composer -symfony/polyfill-php73 v1.27.0 php-composer -symfony/polyfill-php80 v1.27.0 php-composer -symfony/polyfill-php81 v1.27.0 php-composer -symfony/process v5.4.19 php-composer -symfony/service-contracts v2.5.2 php-composer -symfony/var-exporter v5.4.19 php-composer -tecnickcom/tcpdf 6.6.2 php-composer +ssl_client 1.37.0-r12 apk +symfony/cache v5.4.46 php-composer +symfony/cache-contracts v2.5.4 php-composer +symfony/config v5.4.46 php-composer +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-mbstring v1.31.0 php-composer +symfony/polyfill-php73 v1.31.0 php-composer +symfony/polyfill-php80 v1.31.0 php-composer +symfony/polyfill-php81 v1.31.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 thecodingmachine/safe v1.3.3 php-composer -twig/twig v3.5.0 php-composer +twig/twig v3.11.3 php-composer tzdata 2024b-r1 apk utmps-libs 0.1.2.3-r2 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.2.14 php-composer +williamdes/mariadb-mysql-kbs v1.3.0 php-composer xz-libs 5.6.3-r0 apk zlib 1.3.1-r2 apk zstd-libs 1.5.6-r2 apk From 540cf458e14a2bef7573835e1b8c141f0cf8dcb4 Mon Sep 17 00:00:00 2001 From: quietsy Date: Wed, 22 Jan 2025 17:12:36 +0200 Subject: [PATCH 13/85] Add categories to readme-vars.yml --- readme-vars.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/readme-vars.yml b/readme-vars.yml index 83dcd2f..fb7b956 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -7,6 +7,7 @@ project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/ma project_blurb: | [{{ project_name|capitalize }}]({{ project_url }}) is a free software tool written in PHP, intended to handle the administration of MySQL over the Web. phpMyAdmin supports a wide range of operations on MySQL and MariaDB. project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" +project_categories: "Databases" # supported architectures available_architectures: - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"} From 52c57a5320e7d1d2b1ddc914a00d888067c71c9c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 22 Jan 2025 18:05:26 +0000 Subject: [PATCH 14/85] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index a6d6435..005cf99 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,7 +22,7 @@ ca-certificates 20241121-r1 apk ca-certificates-bundle 20241121-r1 apk catatonit 0.2.0-r0 apk code-lts/u2f-php-server v1.2.2 php-composer -composer 2.8.4 binary +composer 2.8.5 binary composer/ca-bundle 1.5.5 php-composer coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk From cdfdf4631da39ba1e1c3262a4f5bbbab3411f0dc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 31 Jan 2025 21:32:33 +0000 Subject: [PATCH 15/85] Bot Updating Templated Files --- Jenkinsfile | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a0d2d42..7f04615 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,11 +59,21 @@ pipeline { steps{ echo "Running on node: ${NODE_NAME}" sh '''#! /bin/bash - containers=$(docker ps -aq) + echo "Pruning builder" + docker builder prune -f --builder container || : + containers=$(docker ps -q) if [[ -n "${containers}" ]]; then - docker stop ${containers} + BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit') + for container in ${containers}; do + if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then + echo "skipping buildx container in docker stop" + else + echo "Stopping container ${container}" + docker stop ${container} + fi + done fi - docker system prune -af --volumes || : ''' + docker system prune -f --volumes || : ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -1155,12 +1165,21 @@ EOF } cleanup { sh '''#! /bin/bash - echo "Performing docker system prune!!" - containers=$(docker ps -aq) + echo "Pruning builder!!" + docker builder prune -f --builder container || : + containers=$(docker ps -q) if [[ -n "${containers}" ]]; then - docker stop ${containers} + BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit') + for container in ${containers}; do + if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then + echo "skipping buildx container in docker stop" + else + echo "Stopping container ${container}" + docker stop ${container} + fi + done fi - docker system prune -af --volumes || : + docker system prune -f --volumes || : ''' cleanWs() } From 375c9c7258f6c9de7100e1e7a73016da544e232d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 31 Jan 2025 21:34:11 +0000 Subject: [PATCH 16/85] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 2 +- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/workflows/external_trigger.yml | 10 +++++++++- README.md | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e37342f..8064a41 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -6,7 +6,7 @@ * Read, and fill the Pull Request template * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR * If the PR is addressing an existing issue include, closes #\, in the body of the PR commit message -* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn) +* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://linuxserver.io/discord) ## Common files diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 34d3e97..d076084 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - name: Discord chat support - url: https://discord.gg/YWrKVTn + url: https://linuxserver.io/discord about: Realtime support / chat with the community and the team. - name: Discourse discussion forum diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index c14d469..9022daf 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -15,7 +15,10 @@ jobs: SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }} run: | printf "# External trigger for docker-phpmyadmin\n\n" >> $GITHUB_STEP_SUMMARY - if grep -q "^phpmyadmin_main" <<< "${SKIP_EXTERNAL_TRIGGER}"; then + if grep -q "^phpmyadmin_main_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`phpmyadmin_main_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY + elif grep -q "^phpmyadmin_main" <<< "${SKIP_EXTERNAL_TRIGGER}"; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`phpmyadmin_main\`; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 @@ -25,6 +28,11 @@ jobs: printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY EXT_RELEASE=$(curl -sL 'https://www.phpmyadmin.net/home_page/version.txt' | head -n 1 | cut -d ' ' -f 1) echo "Type is \`custom_version_command\`" >> $GITHUB_STEP_SUMMARY + if grep -q "^phpmyadmin_main_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY + exit 0 + fi if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY diff --git a/README.md b/README.md index 45b2ff5..562c515 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") -[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.") +[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://linuxserver.io/discord "realtime support / chat with the community and the team.") [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.") [![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") [![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.") @@ -20,7 +20,7 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r Find us at: * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! -* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team. +* [Discord](https://linuxserver.io/discord) - realtime support / chat with the community and the team. * [Discourse](https://discourse.linuxserver.io) - post on our community forum. * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images. * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories. From 24e293bfda9e85980525b4a6d3ac625f80d7c233 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 14 Feb 2025 21:32:32 +0000 Subject: [PATCH 17/85] Bot Updating Templated Files --- Jenkinsfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7f04615..fe1c945 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -73,7 +73,9 @@ pipeline { fi done fi - docker system prune -f --volumes || : ''' + docker system prune -f --volumes || : + docker image prune -af || : + ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -754,7 +756,8 @@ pipeline { if [[ -n "${containers}" ]]; then docker stop ${containers} fi - docker system prune -af --volumes || : + docker system prune -f --volumes || : + docker image prune -af || : ''' } } @@ -1180,6 +1183,7 @@ EOF done fi docker system prune -f --volumes || : + docker image prune -af || : ''' cleanWs() } From c32cbd3fb271d35eb3960d06b2399f56eda260d1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 14 Feb 2025 21:35:12 +0000 Subject: [PATCH 18/85] Bot Updating Package Versions --- package_versions.txt | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 005cf99..ae6ce16 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -28,7 +28,7 @@ coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk coreutils-fmt 9.5-r2 apk coreutils-sha512sum 9.5-r2 apk -curl 8.11.1-r0 apk +curl 8.12.0-r0 apk dasprid/enum 1.0.6 php-composer fgrosse/phpasn1 v2.5.0 php-composer fig/http-message-util 1.1.5 php-composer @@ -44,8 +44,8 @@ libattr 2.5.2-r2 apk libavif 1.0.4-r0 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk -libcrypto3 3.3.2-r4 apk -libcurl 8.11.1-r0 apk +libcrypto3 3.3.3-r0 apk +libcurl 8.12.0-r0 apk libdav1d 1.5.0-r0 apk libedit 20240808.3.1-r0 apk libexpat 2.6.4-r0 apk @@ -61,7 +61,7 @@ libproc2 4.0.4-r2 apk libpsl 0.21.5-r3 apk libsharpyuv 1.4.0-r0 apk libsm 1.2.4-r4 apk -libssl3 3.3.2-r4 apk +libssl3 3.3.3-r0 apk libunistring 1.2-r0 apk libuuid 2.40.4-r0 apk libwebp 1.4.0-r0 apk @@ -85,35 +85,35 @@ nghttp2-libs 1.64.0-r0 apk nginx 1.26.2-r4 apk nikic/fast-route v1.3.0 php-composer oniguruma 6.9.9-r0 apk -openssl 3.3.2-r4 apk +openssl 3.3.3-r0 apk paragonie/constant_time_encoding v2.7.0 php-composer paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.21.1 php-composer pcre 8.45-r3 apk pcre2 10.43-r0 apk -php83 8.3.16-r0 apk -php83-bz2 8.3.16-r0 apk -php83-common 8.3.16-r0 apk -php83-ctype 8.3.16-r0 apk -php83-curl 8.3.16-r0 apk -php83-dom 8.3.16-r0 apk -php83-fileinfo 8.3.16-r0 apk -php83-fpm 8.3.16-r0 apk -php83-gd 8.3.16-r0 apk -php83-iconv 8.3.16-r0 apk -php83-mbstring 8.3.16-r0 apk -php83-mysqli 8.3.16-r0 apk -php83-mysqlnd 8.3.16-r0 apk -php83-opcache 8.3.16-r0 apk -php83-openssl 8.3.16-r0 apk +php83 8.3.17-r0 apk +php83-bz2 8.3.17-r0 apk +php83-common 8.3.17-r0 apk +php83-ctype 8.3.17-r0 apk +php83-curl 8.3.17-r0 apk +php83-dom 8.3.17-r0 apk +php83-fileinfo 8.3.17-r0 apk +php83-fpm 8.3.17-r0 apk +php83-gd 8.3.17-r0 apk +php83-iconv 8.3.17-r0 apk +php83-mbstring 8.3.17-r0 apk +php83-mysqli 8.3.17-r0 apk +php83-mysqlnd 8.3.17-r0 apk +php83-opcache 8.3.17-r0 apk +php83-openssl 8.3.17-r0 apk php83-pecl-uploadprogress 2.0.2-r1 apk -php83-phar 8.3.16-r0 apk -php83-session 8.3.16-r0 apk -php83-simplexml 8.3.16-r0 apk -php83-tokenizer 8.3.16-r0 apk -php83-xml 8.3.16-r0 apk -php83-xmlwriter 8.3.16-r0 apk -php83-zip 8.3.16-r0 apk +php83-phar 8.3.17-r0 apk +php83-session 8.3.17-r0 apk +php83-simplexml 8.3.17-r0 apk +php83-tokenizer 8.3.17-r0 apk +php83-xml 8.3.17-r0 apk +php83-xmlwriter 8.3.17-r0 apk +php83-zip 8.3.17-r0 apk phpmyadmin 5.2.2 npm phpmyadmin/motranslator 5.3.1 php-composer phpmyadmin/shapefile 3.0.2 php-composer From 38b8983324f058a3c6323618d217d7d6eacebab1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 21 Feb 2025 21:33:11 +0000 Subject: [PATCH 19/85] Bot Updating Package Versions --- package_versions.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ae6ce16..0aad6be 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,10 +3,10 @@ acl-libs 2.3.2-r1 apk alpine-baselayout 3.6.8-r1 apk alpine-baselayout-data 3.6.8-r1 apk alpine-keys 2.5-r0 apk -alpine-release 3.21.2-r0 apk +alpine-release 3.21.3-r0 apk aom-libs 3.11.0-r0 apk apache2-utils 2.4.62-r0 apk -apk-tools 2.14.6-r2 apk +apk-tools 2.14.6-r3 apk apr 1.7.5-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk @@ -28,7 +28,7 @@ coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk coreutils-fmt 9.5-r2 apk coreutils-sha512sum 9.5-r2 apk -curl 8.12.0-r0 apk +curl 8.12.1-r0 apk dasprid/enum 1.0.6 php-composer fgrosse/phpasn1 v2.5.0 php-composer fig/http-message-util 1.1.5 php-composer @@ -45,7 +45,7 @@ libavif 1.0.4-r0 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.3.3-r0 apk -libcurl 8.12.0-r0 apk +libcurl 8.12.1-r0 apk libdav1d 1.5.0-r0 apk libedit 20240808.3.1-r0 apk libexpat 2.6.4-r0 apk @@ -76,8 +76,8 @@ libxt 1.3.1-r0 apk libzip 1.11.2-r0 apk linux-pam 1.6.1-r1 apk logrotate 3.21.0-r1 apk -musl 1.2.5-r8 apk -musl-utils 1.2.5-r8 apk +musl 1.2.5-r9 apk +musl-utils 1.2.5-r9 apk nano 8.2-r0 apk ncurses-terminfo-base 6.5_p20241006-r3 apk netcat-openbsd 1.226.1.1-r0 apk @@ -158,7 +158,7 @@ symfony/var-exporter v5.4.45 php-composer tecnickcom/tcpdf 6.8.0 php-composer thecodingmachine/safe v1.3.3 php-composer twig/twig v3.11.3 php-composer -tzdata 2024b-r1 apk +tzdata 2025a-r0 apk utmps-libs 0.1.2.3-r2 apk web-auth/cose-lib v3.3.12 php-composer web-auth/metadata-service v3.3.12 php-composer From 58cd756865add3cf1496a4e4a0b04fc0b661624c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 28 Feb 2025 21:34:20 +0000 Subject: [PATCH 20/85] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 0aad6be..7efbbfb 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,7 +22,7 @@ ca-certificates 20241121-r1 apk ca-certificates-bundle 20241121-r1 apk catatonit 0.2.0-r0 apk code-lts/u2f-php-server v1.2.2 php-composer -composer 2.8.5 binary +composer 2.8.6 binary composer/ca-bundle 1.5.5 php-composer coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk From 22b0bc15a2a8d01734363b339babb9bed4104ae0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 14 Mar 2025 21:36:32 +0000 Subject: [PATCH 21/85] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 7efbbfb..1b6d2a5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -70,7 +70,7 @@ libxau 1.0.11-r4 apk libxcb 1.16.1-r0 apk libxdmcp 1.1.5-r1 apk libxext 1.3.6-r2 apk -libxml2 2.13.4-r3 apk +libxml2 2.13.4-r5 apk libxpm 3.5.17-r0 apk libxt 1.3.1-r0 apk libzip 1.11.2-r0 apk From 72599daf0344182c6e03866ad10042ba70e85432 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 21 Mar 2025 21:34:32 +0000 Subject: [PATCH 22/85] Bot Updating Package Versions --- package_versions.txt | 50 ++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1b6d2a5..82258b3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -48,7 +48,7 @@ libcrypto3 3.3.3-r0 apk libcurl 8.12.1-r0 apk libdav1d 1.5.0-r0 apk libedit 20240808.3.1-r0 apk -libexpat 2.6.4-r0 apk +libexpat 2.7.0-r0 apk libgcc 14.2.0-r4 apk libice 1.1.1-r6 apk libidn2 2.3.7-r0 apk @@ -56,7 +56,7 @@ libintl 0.22.5-r0 apk libjpeg-turbo 3.0.4-r0 apk libmd 1.1.0-r0 apk libncursesw 6.5_p20241006-r3 apk -libpng 1.6.44-r0 apk +libpng 1.6.47-r0 apk libproc2 4.0.4-r2 apk libpsl 0.21.5-r3 apk libsharpyuv 1.4.0-r0 apk @@ -82,7 +82,7 @@ nano 8.2-r0 apk ncurses-terminfo-base 6.5_p20241006-r3 apk netcat-openbsd 1.226.1.1-r0 apk nghttp2-libs 1.64.0-r0 apk -nginx 1.26.2-r4 apk +nginx 1.26.3-r0 apk nikic/fast-route v1.3.0 php-composer oniguruma 6.9.9-r0 apk openssl 3.3.3-r0 apk @@ -91,29 +91,29 @@ paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.21.1 php-composer pcre 8.45-r3 apk pcre2 10.43-r0 apk -php83 8.3.17-r0 apk -php83-bz2 8.3.17-r0 apk -php83-common 8.3.17-r0 apk -php83-ctype 8.3.17-r0 apk -php83-curl 8.3.17-r0 apk -php83-dom 8.3.17-r0 apk -php83-fileinfo 8.3.17-r0 apk -php83-fpm 8.3.17-r0 apk -php83-gd 8.3.17-r0 apk -php83-iconv 8.3.17-r0 apk -php83-mbstring 8.3.17-r0 apk -php83-mysqli 8.3.17-r0 apk -php83-mysqlnd 8.3.17-r0 apk -php83-opcache 8.3.17-r0 apk -php83-openssl 8.3.17-r0 apk +php83 8.3.18-r0 apk +php83-bz2 8.3.18-r0 apk +php83-common 8.3.18-r0 apk +php83-ctype 8.3.18-r0 apk +php83-curl 8.3.18-r0 apk +php83-dom 8.3.18-r0 apk +php83-fileinfo 8.3.18-r0 apk +php83-fpm 8.3.18-r0 apk +php83-gd 8.3.18-r0 apk +php83-iconv 8.3.18-r0 apk +php83-mbstring 8.3.18-r0 apk +php83-mysqli 8.3.18-r0 apk +php83-mysqlnd 8.3.18-r0 apk +php83-opcache 8.3.18-r0 apk +php83-openssl 8.3.18-r0 apk php83-pecl-uploadprogress 2.0.2-r1 apk -php83-phar 8.3.17-r0 apk -php83-session 8.3.17-r0 apk -php83-simplexml 8.3.17-r0 apk -php83-tokenizer 8.3.17-r0 apk -php83-xml 8.3.17-r0 apk -php83-xmlwriter 8.3.17-r0 apk -php83-zip 8.3.17-r0 apk +php83-phar 8.3.18-r0 apk +php83-session 8.3.18-r0 apk +php83-simplexml 8.3.18-r0 apk +php83-tokenizer 8.3.18-r0 apk +php83-xml 8.3.18-r0 apk +php83-xmlwriter 8.3.18-r0 apk +php83-zip 8.3.18-r0 apk phpmyadmin 5.2.2 npm phpmyadmin/motranslator 5.3.1 php-composer phpmyadmin/shapefile 3.0.2 php-composer From 1fbf2bb8440f468ebf9ac055462facb0f1cd3caf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 28 Mar 2025 21:35:46 +0000 Subject: [PATCH 23/85] Bot Updating Package Versions --- package_versions.txt | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 82258b3..d6278b6 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -28,7 +28,7 @@ coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk coreutils-fmt 9.5-r2 apk coreutils-sha512sum 9.5-r2 apk -curl 8.12.1-r0 apk +curl 8.12.1-r1 apk dasprid/enum 1.0.6 php-composer fgrosse/phpasn1 v2.5.0 php-composer fig/http-message-util 1.1.5 php-composer @@ -45,7 +45,7 @@ libavif 1.0.4-r0 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.3.3-r0 apk -libcurl 8.12.1-r0 apk +libcurl 8.12.1-r1 apk libdav1d 1.5.0-r0 apk libedit 20240808.3.1-r0 apk libexpat 2.7.0-r0 apk @@ -91,29 +91,29 @@ paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.21.1 php-composer pcre 8.45-r3 apk pcre2 10.43-r0 apk -php83 8.3.18-r0 apk -php83-bz2 8.3.18-r0 apk -php83-common 8.3.18-r0 apk -php83-ctype 8.3.18-r0 apk -php83-curl 8.3.18-r0 apk -php83-dom 8.3.18-r0 apk -php83-fileinfo 8.3.18-r0 apk -php83-fpm 8.3.18-r0 apk -php83-gd 8.3.18-r0 apk -php83-iconv 8.3.18-r0 apk -php83-mbstring 8.3.18-r0 apk -php83-mysqli 8.3.18-r0 apk -php83-mysqlnd 8.3.18-r0 apk -php83-opcache 8.3.18-r0 apk -php83-openssl 8.3.18-r0 apk +php83 8.3.19-r0 apk +php83-bz2 8.3.19-r0 apk +php83-common 8.3.19-r0 apk +php83-ctype 8.3.19-r0 apk +php83-curl 8.3.19-r0 apk +php83-dom 8.3.19-r0 apk +php83-fileinfo 8.3.19-r0 apk +php83-fpm 8.3.19-r0 apk +php83-gd 8.3.19-r0 apk +php83-iconv 8.3.19-r0 apk +php83-mbstring 8.3.19-r0 apk +php83-mysqli 8.3.19-r0 apk +php83-mysqlnd 8.3.19-r0 apk +php83-opcache 8.3.19-r0 apk +php83-openssl 8.3.19-r0 apk php83-pecl-uploadprogress 2.0.2-r1 apk -php83-phar 8.3.18-r0 apk -php83-session 8.3.18-r0 apk -php83-simplexml 8.3.18-r0 apk -php83-tokenizer 8.3.18-r0 apk -php83-xml 8.3.18-r0 apk -php83-xmlwriter 8.3.18-r0 apk -php83-zip 8.3.18-r0 apk +php83-phar 8.3.19-r0 apk +php83-session 8.3.19-r0 apk +php83-simplexml 8.3.19-r0 apk +php83-tokenizer 8.3.19-r0 apk +php83-xml 8.3.19-r0 apk +php83-xmlwriter 8.3.19-r0 apk +php83-zip 8.3.19-r0 apk phpmyadmin 5.2.2 npm phpmyadmin/motranslator 5.3.1 php-composer phpmyadmin/shapefile 3.0.2 php-composer From 2f8e8d1f95b0057730bc31484048df46c5c45cdf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 4 Apr 2025 21:36:06 +0000 Subject: [PATCH 24/85] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d6278b6..348aa67 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,7 +22,7 @@ ca-certificates 20241121-r1 apk ca-certificates-bundle 20241121-r1 apk catatonit 0.2.0-r0 apk code-lts/u2f-php-server v1.2.2 php-composer -composer 2.8.6 binary +composer 2.8.7 binary composer/ca-bundle 1.5.5 php-composer coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk @@ -158,7 +158,7 @@ symfony/var-exporter v5.4.45 php-composer tecnickcom/tcpdf 6.8.0 php-composer thecodingmachine/safe v1.3.3 php-composer twig/twig v3.11.3 php-composer -tzdata 2025a-r0 apk +tzdata 2025b-r0 apk utmps-libs 0.1.2.3-r2 apk web-auth/cose-lib v3.3.12 php-composer web-auth/metadata-service v3.3.12 php-composer From 214794a5d3f86d8a4cd6985d1bf5067b20180656 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 11 Apr 2025 21:34:50 +0000 Subject: [PATCH 25/85] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 348aa67..92925f0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,12 +17,12 @@ brick/math 0.8.17 php-composer brotli-libs 1.1.0-r2 apk busybox 1.37.0-r12 apk busybox-binsh 1.37.0-r12 apk -c-ares 1.34.3-r0 apk +c-ares 1.34.5-r0 apk ca-certificates 20241121-r1 apk ca-certificates-bundle 20241121-r1 apk catatonit 0.2.0-r0 apk code-lts/u2f-php-server v1.2.2 php-composer -composer 2.8.7 binary +composer 2.8.8 binary composer/ca-bundle 1.5.5 php-composer coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk @@ -165,6 +165,6 @@ 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.6.3-r0 apk +xz-libs 5.6.3-r1 apk zlib 1.3.1-r2 apk zstd-libs 1.5.6-r2 apk From ab7bdd7a3bfcd4287de228fd08ee67ace763ea13 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 18 Apr 2025 21:35:23 +0000 Subject: [PATCH 26/85] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 92925f0..70d9733 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -63,7 +63,7 @@ libsharpyuv 1.4.0-r0 apk libsm 1.2.4-r4 apk libssl3 3.3.3-r0 apk libunistring 1.2-r0 apk -libuuid 2.40.4-r0 apk +libuuid 2.40.4-r1 apk libwebp 1.4.0-r0 apk libx11 1.8.10-r0 apk libxau 1.0.11-r4 apk From ed5be3e92ca62b7bc7938a1b2c120b07f1de7c0d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 16 May 2025 21:35:13 +0000 Subject: [PATCH 27/85] Bot Updating Templated Files --- readme-vars.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/readme-vars.yml b/readme-vars.yml index fb7b956..703ec23 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -63,6 +63,7 @@ init_diagram: | init-phpmyadmin-config -> init-config-end init-config -> init-crontab-config init-mods-end -> init-custom-files + init-adduser -> init-device-perms base -> init-envfile init-os-end -> init-folders init-php -> init-keygen @@ -73,6 +74,7 @@ init_diagram: | init-samples -> init-nginx init-version-checks -> init-nginx-end init-adduser -> init-os-end + init-device-perms -> init-os-end init-envfile -> init-os-end init-keygen -> init-permissions init-nginx -> init-php From ae94d56468063b8d7024f93176b3ceb2f017e82e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 16 May 2025 21:37:51 +0000 Subject: [PATCH 28/85] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 70d9733..fb12616 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,7 +22,7 @@ ca-certificates 20241121-r1 apk ca-certificates-bundle 20241121-r1 apk catatonit 0.2.0-r0 apk code-lts/u2f-php-server v1.2.2 php-composer -composer 2.8.8 binary +composer 2.8.9 binary composer/ca-bundle 1.5.5 php-composer coreutils 9.5-r2 apk coreutils-env 9.5-r2 apk @@ -70,7 +70,7 @@ libxau 1.0.11-r4 apk libxcb 1.16.1-r0 apk libxdmcp 1.1.5-r1 apk libxext 1.3.6-r2 apk -libxml2 2.13.4-r5 apk +libxml2 2.13.4-r6 apk libxpm 3.5.17-r0 apk libxt 1.3.1-r0 apk libzip 1.11.2-r0 apk From f43cec1294d2368df777f08ab774dee685a583bc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 13 Jun 2025 21:38:49 +0000 Subject: [PATCH 29/85] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index fe1c945..932d18e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -783,7 +783,7 @@ pipeline { docker run --rm \ -v /var/run/docker.sock:/var/run/docker.sock:ro \ -v ${TEMPDIR}:/tmp \ - ghcr.io/anchore/syft:latest \ + ghcr.io/anchore/syft:v1.26.1 \ ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" From b9dd92ea4141242df6df9dd2c6d1826dd517e187 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 4 Jul 2025 21:37:16 +0000 Subject: [PATCH 30/85] Bot Updating Templated Files --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 932d18e..e9667ef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -97,7 +97,11 @@ pipeline { env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml' + if ( env.SYFT_IMAGE_TAG == null ) { + env.SYFT_IMAGE_TAG = 'latest' + } } + echo "Using syft image tag ${SYFT_IMAGE_TAG}" sh '''#! /bin/bash echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" ''' script{ @@ -783,7 +787,7 @@ pipeline { docker run --rm \ -v /var/run/docker.sock:/var/run/docker.sock:ro \ -v ${TEMPDIR}:/tmp \ - ghcr.io/anchore/syft:v1.26.1 \ + ghcr.io/anchore/syft:${SYFT_IMAGE_TAG} \ ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" @@ -893,6 +897,7 @@ pipeline { -e WEB_AUTH=\"${CI_AUTH}\" \ -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 \ python3 test_build.py''' } From 2727f2593acebbd06b864db800e4d37e754604e5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 4 Jul 2025 21:39:00 +0000 Subject: [PATCH 31/85] Bot Updating Templated Files --- .github/workflows/call_issue_pr_tracker.yml | 3 +++ .github/workflows/call_issues_cron.yml | 3 +++ .github/workflows/external_trigger.yml | 15 +++++++++------ .github/workflows/external_trigger_scheduler.yml | 3 +++ .github/workflows/greetings.yml | 6 ++++++ .github/workflows/package_trigger_scheduler.yml | 3 +++ README.md | 3 --- 7 files changed, 27 insertions(+), 9 deletions(-) diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml index 2c30784..d07cf12 100755 --- a/.github/workflows/call_issue_pr_tracker.yml +++ b/.github/workflows/call_issue_pr_tracker.yml @@ -8,6 +8,9 @@ on: pull_request_review: types: [submitted,edited,dismissed] +permissions: + contents: read + jobs: manage-project: permissions: diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml index a991578..4d2bdb4 100755 --- a/.github/workflows/call_issues_cron.yml +++ b/.github/workflows/call_issues_cron.yml @@ -4,6 +4,9 @@ on: - cron: '11 3 * * *' workflow_dispatch: +permissions: + contents: read + jobs: stale: permissions: diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 9022daf..05e680b 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -3,6 +3,9 @@ name: External Trigger Main on: workflow_dispatch: +permissions: + contents: read + jobs: external-trigger-main: runs-on: ubuntu-latest @@ -43,8 +46,8 @@ jobs: "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} exit 1 fi - EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') - echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY + EXT_RELEASE_SANITIZED=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g') + echo "Sanitized external version: \`${EXT_RELEASE_SANITIZED}\`" >> $GITHUB_STEP_SUMMARY echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY image="linuxserver/phpmyadmin" tag="latest" @@ -100,8 +103,8 @@ jobs: exit 1 fi echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY - if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then - echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY + if [ "${EXT_RELEASE_SANITIZED}" == "${IMAGE_VERSION}" ]; then + echo "Sanitized version \`${EXT_RELEASE_SANITIZED}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY exit 0 elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-phpmyadmin/job/main/lastBuild/api/json | jq -r '.building') == "true" ]; then echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY @@ -116,7 +119,7 @@ jobs: "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} else printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY - echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY + echo "New sanitized version \`${EXT_RELEASE_SANITIZED}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY if [[ "${artifacts_found}" == "true" ]]; then echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY fi @@ -136,7 +139,7 @@ jobs: --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ --data-urlencode "Submit=Submit" echo "**** Notifying Discord ****" - TRIGGER_REASON="A version change was detected for phpmyadmin tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}" + TRIGGER_REASON="A version change was detected for phpmyadmin tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE_SANITIZED}" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}], "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index dcafde1..c36e482 100644 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -5,6 +5,9 @@ on: - cron: '43 * * * *' workflow_dispatch: +permissions: + contents: read + jobs: external-trigger-scheduler: runs-on: ubuntu-latest diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 8c86d93..182c3be 100644 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -2,8 +2,14 @@ name: Greetings on: [pull_request_target, issues] +permissions: + contents: read + jobs: greeting: + permissions: + issues: write + pull-requests: write runs-on: ubuntu-latest steps: - uses: actions/first-interaction@v1 diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index a28c125..3d18f04 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -5,6 +5,9 @@ on: - cron: '24 21 * * 5' workflow_dispatch: +permissions: + contents: read + jobs: package-trigger-scheduler: runs-on: ubuntu-latest diff --git a/README.md b/README.md index 562c515..1a17531 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!") [![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://linuxserver.io/discord "realtime support / chat with the community and the team.") [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.") -[![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.") [![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.") [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget") @@ -22,7 +21,6 @@ Find us at: * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more! * [Discord](https://linuxserver.io/discord) - realtime support / chat with the community and the team. * [Discourse](https://discourse.linuxserver.io) - post on our community forum. -* [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images. * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories. * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget @@ -55,7 +53,6 @@ The architectures supported by this image are: | :----: | :----: | ---- | | x86-64 | ✅ | amd64-\ | | arm64 | ✅ | arm64v8-\ | -| armhf | ❌ | | ## Application Setup From 74d4861bf5d71655f18c79b5bde8c7c6fda3c809 Mon Sep 17 00:00:00 2001 From: thespad Date: Sat, 5 Jul 2025 16:00:46 +0100 Subject: [PATCH 32/85] Rebase to 3.22 --- .editorconfig | 0 .github/ISSUE_TEMPLATE/issue.bug.yml | 0 .github/ISSUE_TEMPLATE/issue.feature.yml | 0 .github/workflows/call_issue_pr_tracker.yml | 0 .github/workflows/call_issues_cron.yml | 0 .github/workflows/permissions.yml | 0 Dockerfile | 28 ++++++++++----------- Dockerfile.aarch64 | 28 ++++++++++----------- README.md | 1 + readme-vars.yml | 1 + 10 files changed, 30 insertions(+), 28 deletions(-) mode change 100755 => 100644 .editorconfig mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.bug.yml mode change 100755 => 100644 .github/ISSUE_TEMPLATE/issue.feature.yml mode change 100755 => 100644 .github/workflows/call_issue_pr_tracker.yml mode change 100755 => 100644 .github/workflows/call_issues_cron.yml mode change 100755 => 100644 .github/workflows/permissions.yml diff --git a/.editorconfig b/.editorconfig old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.bug.yml b/.github/ISSUE_TEMPLATE/issue.bug.yml old mode 100755 new mode 100644 diff --git a/.github/ISSUE_TEMPLATE/issue.feature.yml b/.github/ISSUE_TEMPLATE/issue.feature.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml old mode 100755 new mode 100644 diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml old mode 100755 new mode 100644 diff --git a/Dockerfile b/Dockerfile index 36b5947..83f8c20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.21 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.22 # set version label ARG BUILD_DATE @@ -21,17 +21,17 @@ RUN \ gpg-agent \ gnupg-dirmngr && \ apk add --no-cache \ - php83-bz2 \ - php83-dom \ - php83-gd \ - php83-mysqli \ - php83-opcache \ - php83-pecl-uploadprogress \ - php83-tokenizer && \ + php84-bz2 \ + php84-dom \ + php84-gd \ + php84-mysqli \ + php84-opcache \ + php84-pecl-uploadprogress \ + php84-tokenizer && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \ + grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \ echo "**** setup php opcache ****" && \ { \ echo 'opcache.memory_consumption=128'; \ @@ -39,12 +39,12 @@ RUN \ echo 'opcache.max_accelerated_files=4000'; \ echo 'opcache.revalidate_freq=2'; \ echo 'opcache.fast_shutdown=1'; \ - } > /etc/php83/conf.d/opcache-recommended.ini; \ + } > /etc/php84/conf.d/opcache-recommended.ini; \ \ { \ echo 'session.cookie_httponly=1'; \ echo 'session.use_strict_mode=1'; \ - } > /etc/php83/conf.d/session-strict.ini; \ + } > /etc/php84/conf.d/session-strict.ini; \ \ { \ echo 'allow_url_fopen=Off'; \ @@ -53,7 +53,7 @@ RUN \ echo 'memory_limit=${MEMORY_LIMIT}'; \ echo 'post_max_size=${UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \ - } > /etc/php83/conf.d/phpmyadmin-misc.ini && \ + } > /etc/php84/conf.d/phpmyadmin-misc.ini && \ echo "**** install phpmyadmin ****" && \ mkdir -p /app/www/public && \ if [ -z ${PHPMYADMIN_VERSION+x} ]; then \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a501e4f..c3b6be2 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.21 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.22 # set version label ARG BUILD_DATE @@ -21,17 +21,17 @@ RUN \ gpg-agent \ gnupg-dirmngr && \ apk add --no-cache \ - php83-bz2 \ - php83-dom \ - php83-gd \ - php83-mysqli \ - php83-opcache \ - php83-pecl-uploadprogress \ - php83-tokenizer && \ + php84-bz2 \ + php84-dom \ + php84-gd \ + php84-mysqli \ + php84-opcache \ + php84-pecl-uploadprogress \ + php84-tokenizer && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \ + sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \ + grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \ echo "**** setup php opcache ****" && \ { \ echo 'opcache.memory_consumption=128'; \ @@ -39,12 +39,12 @@ RUN \ echo 'opcache.max_accelerated_files=4000'; \ echo 'opcache.revalidate_freq=2'; \ echo 'opcache.fast_shutdown=1'; \ - } > /etc/php83/conf.d/opcache-recommended.ini; \ + } > /etc/php84/conf.d/opcache-recommended.ini; \ \ { \ echo 'session.cookie_httponly=1'; \ echo 'session.use_strict_mode=1'; \ - } > /etc/php83/conf.d/session-strict.ini; \ + } > /etc/php84/conf.d/session-strict.ini; \ \ { \ echo 'allow_url_fopen=Off'; \ @@ -53,7 +53,7 @@ RUN \ echo 'memory_limit=${MEMORY_LIMIT}'; \ echo 'post_max_size=${UPLOAD_LIMIT}'; \ echo 'upload_max_filesize=${UPLOAD_LIMIT}'; \ - } > /etc/php83/conf.d/phpmyadmin-misc.ini && \ + } > /etc/php84/conf.d/phpmyadmin-misc.ini && \ echo "**** install phpmyadmin ****" && \ mkdir -p /app/www/public && \ if [ -z ${PHPMYADMIN_VERSION+x} ]; then \ diff --git a/README.md b/README.md index 1a17531..1b18bc3 100644 --- a/README.md +++ b/README.md @@ -301,6 +301,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **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. * **24.05.24:** - Rebase to Alpine 3.20. diff --git a/readme-vars.yml b/readme-vars.yml index 703ec23..63df876 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -95,6 +95,7 @@ init_diagram: | "phpmyadmin:latest" <- Base Images # changelog changelogs: + - {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."} - {date: "24.05.24:", desc: "Rebase to Alpine 3.20."} From b89a64e067d3a430f4bc2af8eec2c91492777616 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 5 Jul 2025 19:34:21 +0000 Subject: [PATCH 33/85] Bot Updating Templated Files --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 63df876..d391fdc 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -90,7 +90,7 @@ init_diagram: | svc-php-fpm -> legacy-services } Base Images: { - "baseimage-alpine-nginx:3.21" <- "baseimage-alpine:3.21" + "baseimage-alpine-nginx:3.22" <- "baseimage-alpine:3.22" } "phpmyadmin:latest" <- Base Images # changelog From e83b0fc4aa171af52e47d236217836acd92984e5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sat, 5 Jul 2025 19:39:06 +0000 Subject: [PATCH 34/85] Bot Updating Package Versions --- package_versions.txt | 342 ++++++++++++++++++++++--------------------- 1 file changed, 172 insertions(+), 170 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fb12616..da6aeb7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,170 +1,172 @@ -NAME VERSION TYPE -acl-libs 2.3.2-r1 apk -alpine-baselayout 3.6.8-r1 apk -alpine-baselayout-data 3.6.8-r1 apk -alpine-keys 2.5-r0 apk -alpine-release 3.21.3-r0 apk -aom-libs 3.11.0-r0 apk -apache2-utils 2.4.62-r0 apk -apk-tools 2.14.6-r3 apk -apr 1.7.5-r0 apk -apr-util 1.6.3-r1 apk -argon2-libs 20190702-r5 apk -bacon/bacon-qr-code 2.0.8 php-composer -bash 5.2.37-r0 apk -beberlei/assert v3.3.3 php-composer -brick/math 0.8.17 php-composer -brotli-libs 1.1.0-r2 apk -busybox 1.37.0-r12 apk -busybox-binsh 1.37.0-r12 apk -c-ares 1.34.5-r0 apk -ca-certificates 20241121-r1 apk -ca-certificates-bundle 20241121-r1 apk -catatonit 0.2.0-r0 apk -code-lts/u2f-php-server v1.2.2 php-composer -composer 2.8.9 binary -composer/ca-bundle 1.5.5 php-composer -coreutils 9.5-r2 apk -coreutils-env 9.5-r2 apk -coreutils-fmt 9.5-r2 apk -coreutils-sha512sum 9.5-r2 apk -curl 8.12.1-r1 apk -dasprid/enum 1.0.6 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 -git 2.47.2-r0 apk -git-init-template 2.47.2-r0 apk -google/recaptcha 1.2.4 php-composer -jq 1.7.1-r0 apk -league/uri 6.4.0 php-composer -league/uri-interfaces 2.3.0 php-composer -libattr 2.5.2-r2 apk -libavif 1.0.4-r0 apk -libbsd 0.12.2-r0 apk -libbz2 1.0.8-r6 apk -libcrypto3 3.3.3-r0 apk -libcurl 8.12.1-r1 apk -libdav1d 1.5.0-r0 apk -libedit 20240808.3.1-r0 apk -libexpat 2.7.0-r0 apk -libgcc 14.2.0-r4 apk -libice 1.1.1-r6 apk -libidn2 2.3.7-r0 apk -libintl 0.22.5-r0 apk -libjpeg-turbo 3.0.4-r0 apk -libmd 1.1.0-r0 apk -libncursesw 6.5_p20241006-r3 apk -libpng 1.6.47-r0 apk -libproc2 4.0.4-r2 apk -libpsl 0.21.5-r3 apk -libsharpyuv 1.4.0-r0 apk -libsm 1.2.4-r4 apk -libssl3 3.3.3-r0 apk -libunistring 1.2-r0 apk -libuuid 2.40.4-r1 apk -libwebp 1.4.0-r0 apk -libx11 1.8.10-r0 apk -libxau 1.0.11-r4 apk -libxcb 1.16.1-r0 apk -libxdmcp 1.1.5-r1 apk -libxext 1.3.6-r2 apk -libxml2 2.13.4-r6 apk -libxpm 3.5.17-r0 apk -libxt 1.3.1-r0 apk -libzip 1.11.2-r0 apk -linux-pam 1.6.1-r1 apk -logrotate 3.21.0-r1 apk -musl 1.2.5-r9 apk -musl-utils 1.2.5-r9 apk -nano 8.2-r0 apk -ncurses-terminfo-base 6.5_p20241006-r3 apk -netcat-openbsd 1.226.1.1-r0 apk -nghttp2-libs 1.64.0-r0 apk -nginx 1.26.3-r0 apk -nikic/fast-route v1.3.0 php-composer -oniguruma 6.9.9-r0 apk -openssl 3.3.3-r0 apk -paragonie/constant_time_encoding v2.7.0 php-composer -paragonie/random_compat v9.99.100 php-composer -paragonie/sodium_compat v1.21.1 php-composer -pcre 8.45-r3 apk -pcre2 10.43-r0 apk -php83 8.3.19-r0 apk -php83-bz2 8.3.19-r0 apk -php83-common 8.3.19-r0 apk -php83-ctype 8.3.19-r0 apk -php83-curl 8.3.19-r0 apk -php83-dom 8.3.19-r0 apk -php83-fileinfo 8.3.19-r0 apk -php83-fpm 8.3.19-r0 apk -php83-gd 8.3.19-r0 apk -php83-iconv 8.3.19-r0 apk -php83-mbstring 8.3.19-r0 apk -php83-mysqli 8.3.19-r0 apk -php83-mysqlnd 8.3.19-r0 apk -php83-opcache 8.3.19-r0 apk -php83-openssl 8.3.19-r0 apk -php83-pecl-uploadprogress 2.0.2-r1 apk -php83-phar 8.3.19-r0 apk -php83-session 8.3.19-r0 apk -php83-simplexml 8.3.19-r0 apk -php83-tokenizer 8.3.19-r0 apk -php83-xml 8.3.19-r0 apk -php83-xmlwriter 8.3.19-r0 apk -php83-zip 8.3.19-r0 apk -phpmyadmin 5.2.2 npm -phpmyadmin/motranslator 5.3.1 php-composer -phpmyadmin/shapefile 3.0.2 php-composer -phpmyadmin/sql-parser 5.10.3 php-composer -phpmyadmin/twig-i18n-extension 4.1.3 php-composer -popt 1.19-r4 apk -pragmarx/google2fa v8.0.3 php-composer -pragmarx/google2fa-qrcode v2.1.1 php-composer -procps-ng 4.0.4-r2 apk -psr/cache 1.0.1 php-composer -psr/container 1.1.1 php-composer -psr/http-client 1.0.3 php-composer -psr/http-factory 1.1.0 php-composer -psr/http-message 1.1 php-composer -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-r0 apk -scanelf 1.3.8-r1 apk -shadow 4.16.0-r1 apk -skalibs-libs 2.14.3.0-r0 apk -slim/psr7 1.4.1 php-composer -spomky-labs/base64url v2.0.4 php-composer -spomky-labs/cbor-php v1.1.1 php-composer -ssl_client 1.37.0-r12 apk -symfony/cache v5.4.46 php-composer -symfony/cache-contracts v2.5.4 php-composer -symfony/config v5.4.46 php-composer -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-mbstring v1.31.0 php-composer -symfony/polyfill-php73 v1.31.0 php-composer -symfony/polyfill-php80 v1.31.0 php-composer -symfony/polyfill-php81 v1.31.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 -thecodingmachine/safe v1.3.3 php-composer -twig/twig v3.11.3 php-composer -tzdata 2025b-r0 apk -utmps-libs 0.1.2.3-r2 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.6.3-r1 apk -zlib 1.3.1-r2 apk -zstd-libs 1.5.6-r2 apk +NAME VERSION TYPE +acl-libs 2.3.2-r1 apk +alpine-baselayout 3.7.0-r0 apk +alpine-baselayout-data 3.7.0-r0 apk +alpine-keys 2.5-r0 apk +alpine-release 3.22.0-r0 apk +aom-libs 3.12.1-r0 apk +apache2-utils 2.4.63-r4 apk +apk-tools 2.14.9-r2 apk +apr 1.7.5-r0 apk +apr-util 1.6.3-r1 apk +argon2-libs 20190702-r5 apk +bacon/bacon-qr-code 2.0.8 php-composer +bash 5.2.37-r0 apk +beberlei/assert v3.3.3 php-composer +brick/math 0.8.17 php-composer +brotli-libs 1.1.0-r2 apk +busybox 1.37.0-r18 apk +busybox-binsh 1.37.0-r18 apk +c-ares 1.34.5-r0 apk +ca-certificates 20241121-r2 apk +ca-certificates-bundle 20241121-r2 apk +catatonit 0.2.1-r0 apk +code-lts/u2f-php-server v1.2.2 php-composer +composer 2.8.9 binary +composer/ca-bundle 1.5.5 php-composer +coreutils 9.7-r1 apk +coreutils-env 9.7-r1 apk +coreutils-fmt 9.7-r1 apk +coreutils-sha512sum 9.7-r1 apk +curl 8.14.1-r0 apk +dasprid/enum 1.0.6 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 +git 2.49.0-r0 apk +git-init-template 2.49.0-r0 apk +google/recaptcha 1.2.4 php-composer +jq 1.8.0-r0 apk +league/uri 6.4.0 php-composer +league/uri-interfaces 2.3.0 php-composer +libapk2 2.14.9-r2 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 +libcurl 8.14.1-r0 apk +libdav1d 1.5.1-r0 apk +libedit 20250104.3.1-r1 apk +libexpat 2.7.1-r0 apk +libgcc 14.2.0-r6 apk +libice 1.1.2-r0 apk +libidn2 2.3.7-r0 apk +libintl 0.24.1-r0 apk +libjpeg-turbo 3.1.0-r0 apk +libmd 1.1.0-r0 apk +libncursesw 6.5_p20250503-r0 apk +libpng 1.6.47-r0 apk +libproc2 4.0.4-r3 apk +libpsl 0.21.5-r3 apk +libsharpyuv 1.5.0-r0 apk +libsm 1.2.5-r0 apk +libssl3 3.5.1-r0 apk +libstdc++ 14.2.0-r6 apk +libunistring 1.3-r0 apk +libuuid 2.41-r9 apk +libwebp 1.5.0-r0 apk +libx11 1.8.11-r0 apk +libxau 1.0.12-r0 apk +libxcb 1.17.0-r0 apk +libxdmcp 1.1.5-r1 apk +libxext 1.3.6-r2 apk +libxml2 2.13.8-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 +linux-pam 1.7.0-r4 apk +logrotate 3.21.0-r1 apk +musl 1.2.5-r10 apk +musl-utils 1.2.5-r10 apk +nano 8.4-r0 apk +ncurses-terminfo-base 6.5_p20250503-r0 apk +netcat-openbsd 1.229.1-r0 apk +nghttp2-libs 1.65.0-r0 apk +nginx 1.28.0-r3 apk +nikic/fast-route v1.3.0 php-composer +oniguruma 6.9.10-r0 apk +openssl 3.5.1-r0 apk +paragonie/constant_time_encoding v2.7.0 php-composer +paragonie/random_compat v9.99.100 php-composer +paragonie/sodium_compat v1.21.1 php-composer +pcre2 10.43-r1 apk +php84 8.4.10-r0 apk +php84-bz2 8.4.10-r0 apk +php84-common 8.4.10-r0 apk +php84-ctype 8.4.10-r0 apk +php84-curl 8.4.10-r0 apk +php84-dom 8.4.10-r0 apk +php84-fileinfo 8.4.10-r0 apk +php84-fpm 8.4.10-r0 apk +php84-gd 8.4.10-r0 apk +php84-iconv 8.4.10-r0 apk +php84-mbstring 8.4.10-r0 apk +php84-mysqli 8.4.10-r0 apk +php84-mysqlnd 8.4.10-r0 apk +php84-opcache 8.4.10-r0 apk +php84-openssl 8.4.10-r0 apk +php84-pecl-uploadprogress 2.0.2-r2 apk +php84-phar 8.4.10-r0 apk +php84-session 8.4.10-r0 apk +php84-simplexml 8.4.10-r0 apk +php84-tokenizer 8.4.10-r0 apk +php84-xml 8.4.10-r0 apk +php84-xmlwriter 8.4.10-r0 apk +php84-zip 8.4.10-r0 apk +phpmyadmin 5.2.2 npm +phpmyadmin/motranslator 5.3.1 php-composer +phpmyadmin/shapefile 3.0.2 php-composer +phpmyadmin/sql-parser 5.10.3 php-composer +phpmyadmin/twig-i18n-extension 4.1.3 php-composer +popt 1.19-r4 apk +pragmarx/google2fa v8.0.3 php-composer +pragmarx/google2fa-qrcode v2.1.1 php-composer +procps-ng 4.0.4-r3 apk +psr/cache 1.0.1 php-composer +psr/container 1.1.1 php-composer +psr/http-client 1.0.3 php-composer +psr/http-factory 1.1.0 php-composer +psr/http-message 1.1 php-composer +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 +scanelf 1.3.8-r1 apk +shadow 4.17.3-r0 apk +skalibs-libs 2.14.4.0-r0 apk +slim/psr7 1.4.1 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 +symfony/cache v5.4.46 php-composer +symfony/cache-contracts v2.5.4 php-composer +symfony/config v5.4.46 php-composer +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-mbstring v1.31.0 php-composer +symfony/polyfill-php73 v1.31.0 php-composer +symfony/polyfill-php80 v1.31.0 php-composer +symfony/polyfill-php81 v1.31.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 +thecodingmachine/safe v1.3.3 php-composer +twig/twig v3.11.3 php-composer +tzdata 2025b-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 +zlib 1.3.1-r2 apk +zstd-libs 1.5.7-r0 apk From 87834f7f36cb22d7a4590fbb5b8a899a11327a9e Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 11 Jul 2025 13:26:49 +0100 Subject: [PATCH 35/85] Fix php conf --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 83f8c20..d2a2a0e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,7 +30,7 @@ RUN \ 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 && \ - grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /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 && \ echo "**** setup php opcache ****" && \ { \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c3b6be2..79b300f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -30,7 +30,7 @@ RUN \ 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 && \ - grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf || echo 'clear_env = no' >> /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 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf && \ echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \ echo "**** setup php opcache ****" && \ { \ From 22ee4262426184062b2130218f5223c6b4fc689a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 11 Jul 2025 21:39:38 +0000 Subject: [PATCH 36/85] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index da6aeb7..c88bc4d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ alpine-baselayout-data 3.7.0-r0 apk alpine-keys 2.5-r0 apk alpine-release 3.22.0-r0 apk aom-libs 3.12.1-r0 apk -apache2-utils 2.4.63-r4 apk +apache2-utils 2.4.64-r0 apk apk-tools 2.14.9-r2 apk apr 1.7.5-r0 apk apr-util 1.6.3-r1 apk @@ -22,20 +22,20 @@ ca-certificates 20241121-r2 apk ca-certificates-bundle 20241121-r2 apk catatonit 0.2.1-r0 apk code-lts/u2f-php-server v1.2.2 php-composer -composer 2.8.9 binary +composer 2.8.10 binary composer/ca-bundle 1.5.5 php-composer coreutils 9.7-r1 apk coreutils-env 9.7-r1 apk coreutils-fmt 9.7-r1 apk coreutils-sha512sum 9.7-r1 apk -curl 8.14.1-r0 apk +curl 8.14.1-r1 apk dasprid/enum 1.0.6 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 -git 2.49.0-r0 apk -git-init-template 2.49.0-r0 apk +git 2.49.1-r0 apk +git-init-template 2.49.1-r0 apk google/recaptcha 1.2.4 php-composer jq 1.8.0-r0 apk league/uri 6.4.0 php-composer @@ -46,7 +46,7 @@ libavif 1.3.0-r0 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.5.1-r0 apk -libcurl 8.14.1-r0 apk +libcurl 8.14.1-r1 apk libdav1d 1.5.1-r0 apk libedit 20250104.3.1-r1 apk libexpat 2.7.1-r0 apk From 9ee6f0be97884405612e38dac896cb055531dc78 Mon Sep 17 00:00:00 2001 From: thespad Date: Tue, 15 Jul 2025 10:25:30 +0100 Subject: [PATCH 37/85] Fix error line --- Dockerfile.aarch64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 79b300f..8511001 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -30,7 +30,7 @@ RUN \ 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 && \ - 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/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 && \ echo "**** setup php opcache ****" && \ { \ From ac2d0458ad6b59efa760c5768d700bdc71105352 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 25 Jul 2025 21:41:15 +0000 Subject: [PATCH 38/85] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c88bc4d..858681a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ acl-libs 2.3.2-r1 apk alpine-baselayout 3.7.0-r0 apk alpine-baselayout-data 3.7.0-r0 apk alpine-keys 2.5-r0 apk -alpine-release 3.22.0-r0 apk +alpine-release 3.22.1-r0 apk aom-libs 3.12.1-r0 apk apache2-utils 2.4.64-r0 apk apk-tools 2.14.9-r2 apk @@ -18,8 +18,8 @@ brotli-libs 1.1.0-r2 apk busybox 1.37.0-r18 apk busybox-binsh 1.37.0-r18 apk c-ares 1.34.5-r0 apk -ca-certificates 20241121-r2 apk -ca-certificates-bundle 20241121-r2 apk +ca-certificates 20250619-r0 apk +ca-certificates-bundle 20250619-r0 apk catatonit 0.2.1-r0 apk code-lts/u2f-php-server v1.2.2 php-composer composer 2.8.10 binary From d4fb12cc0cb7cc5afbb958d0e056564d629a3897 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 1 Aug 2025 21:41:04 +0000 Subject: [PATCH 39/85] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 858681a..36fd0e3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ alpine-baselayout-data 3.7.0-r0 apk alpine-keys 2.5-r0 apk alpine-release 3.22.1-r0 apk aom-libs 3.12.1-r0 apk -apache2-utils 2.4.64-r0 apk +apache2-utils 2.4.65-r0 apk apk-tools 2.14.9-r2 apk apr 1.7.5-r0 apk apr-util 1.6.3-r1 apk From 2a3d7e50edbd652ef757cc55d24a119ca7a89ba6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 8 Aug 2025 21:39:31 +0000 Subject: [PATCH 40/85] Bot Updating Package Versions --- package_versions.txt | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 36fd0e3..99f17ce 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -93,29 +93,29 @@ paragonie/constant_time_encoding v2.7.0 php-composer paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.21.1 php-composer pcre2 10.43-r1 apk -php84 8.4.10-r0 apk -php84-bz2 8.4.10-r0 apk -php84-common 8.4.10-r0 apk -php84-ctype 8.4.10-r0 apk -php84-curl 8.4.10-r0 apk -php84-dom 8.4.10-r0 apk -php84-fileinfo 8.4.10-r0 apk -php84-fpm 8.4.10-r0 apk -php84-gd 8.4.10-r0 apk -php84-iconv 8.4.10-r0 apk -php84-mbstring 8.4.10-r0 apk -php84-mysqli 8.4.10-r0 apk -php84-mysqlnd 8.4.10-r0 apk -php84-opcache 8.4.10-r0 apk -php84-openssl 8.4.10-r0 apk +php84 8.4.11-r0 apk +php84-bz2 8.4.11-r0 apk +php84-common 8.4.11-r0 apk +php84-ctype 8.4.11-r0 apk +php84-curl 8.4.11-r0 apk +php84-dom 8.4.11-r0 apk +php84-fileinfo 8.4.11-r0 apk +php84-fpm 8.4.11-r0 apk +php84-gd 8.4.11-r0 apk +php84-iconv 8.4.11-r0 apk +php84-mbstring 8.4.11-r0 apk +php84-mysqli 8.4.11-r0 apk +php84-mysqlnd 8.4.11-r0 apk +php84-opcache 8.4.11-r0 apk +php84-openssl 8.4.11-r0 apk php84-pecl-uploadprogress 2.0.2-r2 apk -php84-phar 8.4.10-r0 apk -php84-session 8.4.10-r0 apk -php84-simplexml 8.4.10-r0 apk -php84-tokenizer 8.4.10-r0 apk -php84-xml 8.4.10-r0 apk -php84-xmlwriter 8.4.10-r0 apk -php84-zip 8.4.10-r0 apk +php84-phar 8.4.11-r0 apk +php84-session 8.4.11-r0 apk +php84-simplexml 8.4.11-r0 apk +php84-tokenizer 8.4.11-r0 apk +php84-xml 8.4.11-r0 apk +php84-xmlwriter 8.4.11-r0 apk +php84-zip 8.4.11-r0 apk phpmyadmin 5.2.2 npm phpmyadmin/motranslator 5.3.1 php-composer phpmyadmin/shapefile 3.0.2 php-composer From b525490c17e92b41cc5c73f41012b8a35a0f65a0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 15 Aug 2025 21:36:37 +0000 Subject: [PATCH 41/85] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 99f17ce..d6ac3bd 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -15,8 +15,8 @@ bash 5.2.37-r0 apk beberlei/assert v3.3.3 php-composer brick/math 0.8.17 php-composer brotli-libs 1.1.0-r2 apk -busybox 1.37.0-r18 apk -busybox-binsh 1.37.0-r18 apk +busybox 1.37.0-r19 apk +busybox-binsh 1.37.0-r19 apk c-ares 1.34.5-r0 apk ca-certificates 20250619-r0 apk ca-certificates-bundle 20250619-r0 apk @@ -141,7 +141,7 @@ skalibs-libs 2.14.4.0-r0 apk slim/psr7 1.4.1 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-r19 apk symfony/cache v5.4.46 php-composer symfony/cache-contracts v2.5.4 php-composer symfony/config v5.4.46 php-composer From 20932b1b9d75e15f8e84f0d7b47042f95493597d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 22 Aug 2025 21:38:32 +0000 Subject: [PATCH 42/85] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index d6ac3bd..02ee241 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,7 +22,7 @@ ca-certificates 20250619-r0 apk ca-certificates-bundle 20250619-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.8.11 binary composer/ca-bundle 1.5.5 php-composer coreutils 9.7-r1 apk coreutils-env 9.7-r1 apk @@ -45,7 +45,7 @@ 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.2-r0 apk libcurl 8.14.1-r1 apk libdav1d 1.5.1-r0 apk libedit 20250104.3.1-r1 apk @@ -62,7 +62,7 @@ libproc2 4.0.4-r3 apk libpsl 0.21.5-r3 apk libsharpyuv 1.5.0-r0 apk libsm 1.2.5-r0 apk -libssl3 3.5.1-r0 apk +libssl3 3.5.2-r0 apk libstdc++ 14.2.0-r6 apk libunistring 1.3-r0 apk libuuid 2.41-r9 apk @@ -88,7 +88,7 @@ nghttp2-libs 1.65.0-r0 apk nginx 1.28.0-r3 apk nikic/fast-route v1.3.0 php-composer oniguruma 6.9.10-r0 apk -openssl 3.5.1-r0 apk +openssl 3.5.2-r0 apk paragonie/constant_time_encoding v2.7.0 php-composer paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.21.1 php-composer From baf96c94698e51171c64f331abf0a38d9392a988 Mon Sep 17 00:00:00 2001 From: thespad Date: Sat, 23 Aug 2025 10:34:08 +0100 Subject: [PATCH 43/85] Sync default config with upstream to support mTLS --- readme-vars.yml | 1 + root/defaults/config.inc.php | 137 +++++++++++++++--- root/defaults/helpers.php | 53 +++++++ .../s6-rc.d/init-phpmyadmin-config/run | 4 + 4 files changed, 173 insertions(+), 22 deletions(-) create mode 100644 root/defaults/helpers.php diff --git a/readme-vars.yml b/readme-vars.yml index d391fdc..4303e43 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -95,6 +95,7 @@ init_diagram: | "phpmyadmin:latest" <- Base Images # changelog changelogs: + - {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."} diff --git a/root/defaults/config.inc.php b/root/defaults/config.inc.php index 703a05d..c0fa35c 100644 --- a/root/defaults/config.inc.php +++ b/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 @@ '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 @@ $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'])) { - $hosts = array($_ENV['PMA_HOST']); - $verbose = array($_ENV['PMA_VERBOSE']); - $ports = array($_ENV['PMA_PORT']); -} elseif (!empty($_ENV['PMA_HOSTS'])) { +if (! empty($_ENV['PMA_HOST'])) { + $hosts = [$_ENV['PMA_HOST']]; + $verbose = [$_ENV['PMA_VERBOSE']]; + $ports = [$_ENV['PMA_PORT']]; + $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']); -} elseif (!empty($_ENV['PMA_SOCKETS'])) { + +if (! empty($_ENV['PMA_SOCKET'])) { + $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 @@ $cfg['Servers'][$i]['compress'] = false; $cfg['Servers'][$i]['AllowNoPassword'] = true; } -for ($i = 1; isset($sockets[$i - 1]); $i++) { - $cfg['Servers'][$i]['socket'] = $sockets[$i - 1]; - $cfg['Servers'][$i]['host'] = 'localhost'; +// Avoid overwriting the last server id $i, use another variable name +for ($socketHostId = 1; isset($sockets[$socketHostId - 1]); $socketHostId++) { + $cfg['Servers'][$socketHostId]['socket'] = $sockets[$socketHostId - 1]; + $cfg['Servers'][$socketHostId]['host'] = 'localhost'; } /* * Revert back to last configured server to make @@ -137,9 +219,13 @@ $i--; /* Uploads setup */ -$cfg['UploadDir'] = ''; -$cfg['SaveDir'] = ''; -$cfg['TempDir'] = '/tmp'; +if (isset($_ENV['PMA_UPLOADDIR'])) { + $cfg['UploadDir'] = $_ENV['PMA_UPLOADDIR']; +} + +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 @@ /* 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; + } } diff --git a/root/defaults/helpers.php b/root/defaults/helpers.php new file mode 100644 index 0000000..807ac5a --- /dev/null +++ b/root/defaults/helpers.php @@ -0,0 +1,53 @@ + Date: Sat, 23 Aug 2025 12:50:21 +0000 Subject: [PATCH 44/85] Bot Updating Templated Files --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 1b18bc3..f049ddc 100644 --- a/README.md +++ b/README.md @@ -301,6 +301,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **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. From 0cdb3767ff2732618af908421e8f156ae78c445e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 19 Sep 2025 21:34:25 +0000 Subject: [PATCH 45/85] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 02ee241..ad25d9e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ alpine-keys 2.5-r0 apk alpine-release 3.22.1-r0 apk aom-libs 3.12.1-r0 apk apache2-utils 2.4.65-r0 apk -apk-tools 2.14.9-r2 apk +apk-tools 2.14.9-r3 apk apr 1.7.5-r0 apk apr-util 1.6.3-r1 apk argon2-libs 20190702-r5 apk @@ -40,7 +40,7 @@ google/recaptcha 1.2.4 php-composer jq 1.8.0-r0 apk league/uri 6.4.0 php-composer league/uri-interfaces 2.3.0 php-composer -libapk2 2.14.9-r2 apk +libapk2 2.14.9-r3 apk libattr 2.5.2-r2 apk libavif 1.3.0-r0 apk libbsd 0.12.2-r0 apk From 48f3306612ff52904c0923e338544b3c7900efef Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 26 Sep 2025 21:34:33 +0000 Subject: [PATCH 46/85] Bot Updating Package Versions --- package_versions.txt | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index ad25d9e..9273033 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,7 +22,7 @@ ca-certificates 20250619-r0 apk ca-certificates-bundle 20250619-r0 apk catatonit 0.2.1-r0 apk code-lts/u2f-php-server v1.2.2 php-composer -composer 2.8.11 binary +composer 2.8.12 binary composer/ca-bundle 1.5.5 php-composer coreutils 9.7-r1 apk coreutils-env 9.7-r1 apk @@ -45,11 +45,11 @@ 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.2-r0 apk +libcrypto3 3.5.3-r0 apk libcurl 8.14.1-r1 apk libdav1d 1.5.1-r0 apk libedit 20250104.3.1-r1 apk -libexpat 2.7.1-r0 apk +libexpat 2.7.2-r0 apk libgcc 14.2.0-r6 apk libice 1.1.2-r0 apk libidn2 2.3.7-r0 apk @@ -62,7 +62,7 @@ libproc2 4.0.4-r3 apk libpsl 0.21.5-r3 apk libsharpyuv 1.5.0-r0 apk libsm 1.2.5-r0 apk -libssl3 3.5.2-r0 apk +libssl3 3.5.3-r0 apk libstdc++ 14.2.0-r6 apk libunistring 1.3-r0 apk libuuid 2.41-r9 apk @@ -88,34 +88,34 @@ nghttp2-libs 1.65.0-r0 apk nginx 1.28.0-r3 apk nikic/fast-route v1.3.0 php-composer oniguruma 6.9.10-r0 apk -openssl 3.5.2-r0 apk +openssl 3.5.3-r0 apk paragonie/constant_time_encoding v2.7.0 php-composer paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.21.1 php-composer pcre2 10.43-r1 apk -php84 8.4.11-r0 apk -php84-bz2 8.4.11-r0 apk -php84-common 8.4.11-r0 apk -php84-ctype 8.4.11-r0 apk -php84-curl 8.4.11-r0 apk -php84-dom 8.4.11-r0 apk -php84-fileinfo 8.4.11-r0 apk -php84-fpm 8.4.11-r0 apk -php84-gd 8.4.11-r0 apk -php84-iconv 8.4.11-r0 apk -php84-mbstring 8.4.11-r0 apk -php84-mysqli 8.4.11-r0 apk -php84-mysqlnd 8.4.11-r0 apk -php84-opcache 8.4.11-r0 apk -php84-openssl 8.4.11-r0 apk +php84 8.4.13-r0 apk +php84-bz2 8.4.13-r0 apk +php84-common 8.4.13-r0 apk +php84-ctype 8.4.13-r0 apk +php84-curl 8.4.13-r0 apk +php84-dom 8.4.13-r0 apk +php84-fileinfo 8.4.13-r0 apk +php84-fpm 8.4.13-r0 apk +php84-gd 8.4.13-r0 apk +php84-iconv 8.4.13-r0 apk +php84-mbstring 8.4.13-r0 apk +php84-mysqli 8.4.13-r0 apk +php84-mysqlnd 8.4.13-r0 apk +php84-opcache 8.4.13-r0 apk +php84-openssl 8.4.13-r0 apk php84-pecl-uploadprogress 2.0.2-r2 apk -php84-phar 8.4.11-r0 apk -php84-session 8.4.11-r0 apk -php84-simplexml 8.4.11-r0 apk -php84-tokenizer 8.4.11-r0 apk -php84-xml 8.4.11-r0 apk -php84-xmlwriter 8.4.11-r0 apk -php84-zip 8.4.11-r0 apk +php84-phar 8.4.13-r0 apk +php84-session 8.4.13-r0 apk +php84-simplexml 8.4.13-r0 apk +php84-tokenizer 8.4.13-r0 apk +php84-xml 8.4.13-r0 apk +php84-xmlwriter 8.4.13-r0 apk +php84-zip 8.4.13-r0 apk phpmyadmin 5.2.2 npm phpmyadmin/motranslator 5.3.1 php-composer phpmyadmin/shapefile 3.0.2 php-composer From 59074fd8f598ce75b5167cd53383a638b0b3a85b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 3 Oct 2025 21:35:06 +0000 Subject: [PATCH 47/85] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 9273033..1466b29 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,11 +45,11 @@ 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.3-r0 apk +libcrypto3 3.5.4-r0 apk libcurl 8.14.1-r1 apk libdav1d 1.5.1-r0 apk libedit 20250104.3.1-r1 apk -libexpat 2.7.2-r0 apk +libexpat 2.7.3-r0 apk libgcc 14.2.0-r6 apk libice 1.1.2-r0 apk libidn2 2.3.7-r0 apk @@ -62,7 +62,7 @@ libproc2 4.0.4-r3 apk libpsl 0.21.5-r3 apk libsharpyuv 1.5.0-r0 apk libsm 1.2.5-r0 apk -libssl3 3.5.3-r0 apk +libssl3 3.5.4-r0 apk libstdc++ 14.2.0-r6 apk libunistring 1.3-r0 apk libuuid 2.41-r9 apk @@ -88,7 +88,7 @@ nghttp2-libs 1.65.0-r0 apk nginx 1.28.0-r3 apk nikic/fast-route v1.3.0 php-composer oniguruma 6.9.10-r0 apk -openssl 3.5.3-r0 apk +openssl 3.5.4-r0 apk paragonie/constant_time_encoding v2.7.0 php-composer paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.21.1 php-composer From acec2facee2809f2bce796f9059dd71d47ae72b4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 8 Oct 2025 04:50:37 +0000 Subject: [PATCH 48/85] Bot Updating Package Versions --- package_versions.txt | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 1466b29..a04f9b4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -23,13 +23,13 @@ ca-certificates-bundle 20250619-r0 apk catatonit 0.2.1-r0 apk code-lts/u2f-php-server v1.2.2 php-composer composer 2.8.12 binary -composer/ca-bundle 1.5.5 php-composer +composer/ca-bundle 1.5.8 php-composer coreutils 9.7-r1 apk coreutils-env 9.7-r1 apk coreutils-fmt 9.7-r1 apk coreutils-sha512sum 9.7-r1 apk curl 8.14.1-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 @@ -89,9 +89,9 @@ nginx 1.28.0-r3 apk nikic/fast-route v1.3.0 php-composer oniguruma 6.9.10-r0 apk openssl 3.5.4-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 php84 8.4.13-r0 apk php84-bz2 8.4.13-r0 apk @@ -116,13 +116,13 @@ php84-tokenizer 8.4.13-r0 apk php84-xml 8.4.13-r0 apk php84-xmlwriter 8.4.13-r0 apk php84-zip 8.4.13-r0 apk -phpmyadmin 5.2.2 npm -phpmyadmin/motranslator 5.3.1 php-composer +phpmyadmin 5.2.3 npm +phpmyadmin/motranslator 5.4.0 php-composer phpmyadmin/shapefile 3.0.2 php-composer -phpmyadmin/sql-parser 5.10.3 php-composer -phpmyadmin/twig-i18n-extension 4.1.3 php-composer +phpmyadmin/sql-parser 5.11.1 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 psr/cache 1.0.1 php-composer @@ -138,7 +138,7 @@ readline 8.2.13-r1 apk scanelf 1.3.8-r1 apk shadow 4.17.3-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-r19 apk @@ -149,16 +149,18 @@ 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-mbstring v1.31.0 php-composer -symfony/polyfill-php73 v1.31.0 php-composer -symfony/polyfill-php80 v1.31.0 php-composer -symfony/polyfill-php81 v1.31.0 php-composer +symfony/polyfill-ctype v1.33.0 php-composer +symfony/polyfill-iconv v1.33.0 php-composer +symfony/polyfill-mbstring v1.33.0 php-composer +symfony/polyfill-php73 v1.33.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 -thecodingmachine/safe v1.3.3 php-composer +tecnickcom/tcpdf 6.10.0 php-composer +thecodingmachine/safe v1.3.3.1 php-composer twig/twig v3.11.3 php-composer tzdata 2025b-r0 apk utmps-libs 0.1.3.1-r0 apk From 1364bb70ea41225867db8c0b3dcb5ce3b07ff836 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 10 Oct 2025 21:33:56 +0000 Subject: [PATCH 49/85] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a04f9b4..7676014 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -18,8 +18,8 @@ brotli-libs 1.1.0-r2 apk busybox 1.37.0-r19 apk busybox-binsh 1.37.0-r19 apk c-ares 1.34.5-r0 apk -ca-certificates 20250619-r0 apk -ca-certificates-bundle 20250619-r0 apk +ca-certificates 20250911-r0 apk +ca-certificates-bundle 20250911-r0 apk catatonit 0.2.1-r0 apk code-lts/u2f-php-server v1.2.2 php-composer composer 2.8.12 binary @@ -28,7 +28,7 @@ coreutils 9.7-r1 apk coreutils-env 9.7-r1 apk coreutils-fmt 9.7-r1 apk coreutils-sha512sum 9.7-r1 apk -curl 8.14.1-r1 apk +curl 8.14.1-r2 apk dasprid/enum 1.0.7 php-composer fgrosse/phpasn1 v2.5.0 php-composer fig/http-message-util 1.1.5 php-composer @@ -46,7 +46,7 @@ libavif 1.3.0-r0 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.5.4-r0 apk -libcurl 8.14.1-r1 apk +libcurl 8.14.1-r2 apk libdav1d 1.5.1-r0 apk libedit 20250104.3.1-r1 apk libexpat 2.7.3-r0 apk @@ -72,7 +72,7 @@ libxau 1.0.12-r0 apk libxcb 1.17.0-r0 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 From 6755d5d983476e21ba0e98757fb980657640145c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 17 Oct 2025 21:33:52 +0000 Subject: [PATCH 50/85] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 7676014..77f2308 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,7 +3,7 @@ acl-libs 2.3.2-r1 apk alpine-baselayout 3.7.0-r0 apk alpine-baselayout-data 3.7.0-r0 apk alpine-keys 2.5-r0 apk -alpine-release 3.22.1-r0 apk +alpine-release 3.22.2-r0 apk aom-libs 3.12.1-r0 apk apache2-utils 2.4.65-r0 apk apk-tools 2.14.9-r3 apk From 65ed7628579df2ef4b3ed8d10bf58f0d549a5dbd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 24 Oct 2025 21:33:44 +0000 Subject: [PATCH 51/85] Bot Updating Templated Files --- Jenkinsfile | 108 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 73 insertions(+), 35 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e9667ef..dc77e56 100644 --- a/Jenkinsfile +++ b/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 - wait "$p" || { echo "job $p failed" >&2; exit 1; } + for p in "${!pids[@]}"; do + 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 - wait "$p" || { echo "job $p failed" >&2; exit 1; } + for p in "${!pids[@]}"; do + 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 - wait "$p" || { echo "job $p failed" >&2; exit 1; } + for p in "${!pids[@]}"; do + 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,7 @@ 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 \ + -t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \ python3 test_build.py''' } } @@ -924,9 +935,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 +964,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}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${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} || \ + { 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}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${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}:${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} + docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest || \ + { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } + 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}:${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 +1002,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}'",\ - "target_commitish": "main",\ - "name": "'${META_TAG}'",\ - "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 - printf '","draft": false,"prerelease": false}' >> releasebody.json - paste -d'\\0' start releasebody.json > 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''' + jq -n \ + --arg tag_name "$META_TAG" \ + --arg target_commitish "main" \ + --arg ci_url "${CI_URL:-N/A}" \ + --arg ls_notes "$AUTO_RELEASE_NOTES" \ + --arg remote_notes "$(cat releasebody.json)" \ + '{ + "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 From 58f8835c0383b565dbea33d8d57e9d9b404f82fa Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 24 Oct 2025 21:36:32 +0000 Subject: [PATCH 52/85] Bot Updating Package Versions --- package_versions.txt | 46 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 77f2308..334fc25 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -92,30 +92,30 @@ openssl 3.5.4-r0 apk paragonie/constant_time_encoding v2.8.2 php-composer paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.23.0 php-composer -pcre2 10.43-r1 apk -php84 8.4.13-r0 apk -php84-bz2 8.4.13-r0 apk -php84-common 8.4.13-r0 apk -php84-ctype 8.4.13-r0 apk -php84-curl 8.4.13-r0 apk -php84-dom 8.4.13-r0 apk -php84-fileinfo 8.4.13-r0 apk -php84-fpm 8.4.13-r0 apk -php84-gd 8.4.13-r0 apk -php84-iconv 8.4.13-r0 apk -php84-mbstring 8.4.13-r0 apk -php84-mysqli 8.4.13-r0 apk -php84-mysqlnd 8.4.13-r0 apk -php84-opcache 8.4.13-r0 apk -php84-openssl 8.4.13-r0 apk +pcre2 10.46-r0 apk +php84 8.4.14-r0 apk +php84-bz2 8.4.14-r0 apk +php84-common 8.4.14-r0 apk +php84-ctype 8.4.14-r0 apk +php84-curl 8.4.14-r0 apk +php84-dom 8.4.14-r0 apk +php84-fileinfo 8.4.14-r0 apk +php84-fpm 8.4.14-r0 apk +php84-gd 8.4.14-r0 apk +php84-iconv 8.4.14-r0 apk +php84-mbstring 8.4.14-r0 apk +php84-mysqli 8.4.14-r0 apk +php84-mysqlnd 8.4.14-r0 apk +php84-opcache 8.4.14-r0 apk +php84-openssl 8.4.14-r0 apk php84-pecl-uploadprogress 2.0.2-r2 apk -php84-phar 8.4.13-r0 apk -php84-session 8.4.13-r0 apk -php84-simplexml 8.4.13-r0 apk -php84-tokenizer 8.4.13-r0 apk -php84-xml 8.4.13-r0 apk -php84-xmlwriter 8.4.13-r0 apk -php84-zip 8.4.13-r0 apk +php84-phar 8.4.14-r0 apk +php84-session 8.4.14-r0 apk +php84-simplexml 8.4.14-r0 apk +php84-tokenizer 8.4.14-r0 apk +php84-xml 8.4.14-r0 apk +php84-xmlwriter 8.4.14-r0 apk +php84-zip 8.4.14-r0 apk phpmyadmin 5.2.3 npm phpmyadmin/motranslator 5.4.0 php-composer phpmyadmin/shapefile 3.0.2 php-composer From d3b89281e2ef58491ba55286b6eee400e405d349 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 14 Nov 2025 21:36:18 +0000 Subject: [PATCH 53/85] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 334fc25..d51a25a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,7 +22,7 @@ ca-certificates 20250911-r0 apk ca-certificates-bundle 20250911-r0 apk catatonit 0.2.1-r0 apk code-lts/u2f-php-server v1.2.2 php-composer -composer 2.8.12 binary +composer 2.9.1 binary composer/ca-bundle 1.5.8 php-composer coreutils 9.7-r1 apk coreutils-env 9.7-r1 apk From 98ced01b703af50af5d821ac43f940d42ee0daec Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 21 Nov 2025 21:34:35 +0000 Subject: [PATCH 54/85] Bot Updating Templated Files --- Jenkinsfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index dc77e56..22d8b8f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -909,6 +909,8 @@ pipeline { -e WEB_PATH=\"${CI_WEBPATH}\" \ -e NODE_NAME=\"${NODE_NAME}\" \ -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \ + -e COMMIT_SHA=\"${COMMIT_SHA}\" \ + -e BUILD_NUMBER=\"${BUILD_NUMBER}\" \ -t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \ python3 test_build.py''' } From 84115e1a401091cc4e39825b8968eca4e25d1e23 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 21 Nov 2025 21:37:49 +0000 Subject: [PATCH 55/85] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index d51a25a..2dcbf3b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,7 +22,7 @@ ca-certificates 20250911-r0 apk ca-certificates-bundle 20250911-r0 apk catatonit 0.2.1-r0 apk code-lts/u2f-php-server v1.2.2 php-composer -composer 2.9.1 binary +composer 2.9.2 binary composer/ca-bundle 1.5.8 php-composer coreutils 9.7-r1 apk coreutils-env 9.7-r1 apk From c3de785282125408aa630303bf6229909e31e84c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 28 Nov 2025 21:35:16 +0000 Subject: [PATCH 56/85] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2dcbf3b..064f58a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -15,8 +15,8 @@ bash 5.2.37-r0 apk beberlei/assert v3.3.3 php-composer brick/math 0.8.17 php-composer brotli-libs 1.1.0-r2 apk -busybox 1.37.0-r19 apk -busybox-binsh 1.37.0-r19 apk +busybox 1.37.0-r20 apk +busybox-binsh 1.37.0-r20 apk c-ares 1.34.5-r0 apk ca-certificates 20250911-r0 apk ca-certificates-bundle 20250911-r0 apk @@ -37,7 +37,7 @@ freetype 2.13.3-r0 apk git 2.49.1-r0 apk git-init-template 2.49.1-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-r3 apk @@ -57,7 +57,7 @@ libintl 0.24.1-r0 apk libjpeg-turbo 3.1.0-r0 apk libmd 1.1.0-r0 apk libncursesw 6.5_p20250503-r0 apk -libpng 1.6.47-r0 apk +libpng 1.6.51-r0 apk libproc2 4.0.4-r3 apk libpsl 0.21.5-r3 apk libsharpyuv 1.5.0-r0 apk @@ -141,7 +141,7 @@ skalibs-libs 2.14.4.0-r0 apk 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-r19 apk +ssl_client 1.37.0-r20 apk symfony/cache v5.4.46 php-composer symfony/cache-contracts v2.5.4 php-composer symfony/config v5.4.46 php-composer From 4bb4ad52d375fe9485f6db875dd948b849934706 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 12 Dec 2025 21:37:25 +0000 Subject: [PATCH 57/85] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 064f58a..df494c0 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ alpine-baselayout-data 3.7.0-r0 apk alpine-keys 2.5-r0 apk alpine-release 3.22.2-r0 apk aom-libs 3.12.1-r0 apk -apache2-utils 2.4.65-r0 apk +apache2-utils 2.4.66-r0 apk apk-tools 2.14.9-r3 apk apr 1.7.5-r0 apk apr-util 1.6.3-r1 apk @@ -57,7 +57,7 @@ libintl 0.24.1-r0 apk libjpeg-turbo 3.1.0-r0 apk libmd 1.1.0-r0 apk libncursesw 6.5_p20250503-r0 apk -libpng 1.6.51-r0 apk +libpng 1.6.53-r0 apk libproc2 4.0.4-r3 apk libpsl 0.21.5-r3 apk libsharpyuv 1.5.0-r0 apk From 854afccafc3cf0c86a0c7eeec3555725026c40d0 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 19 Dec 2025 21:38:24 +0000 Subject: [PATCH 58/85] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index df494c0..071f385 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ brick/math 0.8.17 php-composer brotli-libs 1.1.0-r2 apk busybox 1.37.0-r20 apk busybox-binsh 1.37.0-r20 apk -c-ares 1.34.5-r0 apk +c-ares 1.34.6-r0 apk ca-certificates 20250911-r0 apk ca-certificates-bundle 20250911-r0 apk catatonit 0.2.1-r0 apk @@ -162,7 +162,7 @@ symfony/var-exporter v5.4.45 php-composer tecnickcom/tcpdf 6.10.0 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 From 4659e0090b018783d44eda6b76f3d03bf0d5c91c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 26 Dec 2025 21:38:00 +0000 Subject: [PATCH 59/85] Bot Updating Package Versions --- package_versions.txt | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 071f385..92f6e97 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -93,29 +93,29 @@ paragonie/constant_time_encoding v2.8.2 php-composer paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.23.0 php-composer pcre2 10.46-r0 apk -php84 8.4.14-r0 apk -php84-bz2 8.4.14-r0 apk -php84-common 8.4.14-r0 apk -php84-ctype 8.4.14-r0 apk -php84-curl 8.4.14-r0 apk -php84-dom 8.4.14-r0 apk -php84-fileinfo 8.4.14-r0 apk -php84-fpm 8.4.14-r0 apk -php84-gd 8.4.14-r0 apk -php84-iconv 8.4.14-r0 apk -php84-mbstring 8.4.14-r0 apk -php84-mysqli 8.4.14-r0 apk -php84-mysqlnd 8.4.14-r0 apk -php84-opcache 8.4.14-r0 apk -php84-openssl 8.4.14-r0 apk +php84 8.4.16-r0 apk +php84-bz2 8.4.16-r0 apk +php84-common 8.4.16-r0 apk +php84-ctype 8.4.16-r0 apk +php84-curl 8.4.16-r0 apk +php84-dom 8.4.16-r0 apk +php84-fileinfo 8.4.16-r0 apk +php84-fpm 8.4.16-r0 apk +php84-gd 8.4.16-r0 apk +php84-iconv 8.4.16-r0 apk +php84-mbstring 8.4.16-r0 apk +php84-mysqli 8.4.16-r0 apk +php84-mysqlnd 8.4.16-r0 apk +php84-opcache 8.4.16-r0 apk +php84-openssl 8.4.16-r0 apk php84-pecl-uploadprogress 2.0.2-r2 apk -php84-phar 8.4.14-r0 apk -php84-session 8.4.14-r0 apk -php84-simplexml 8.4.14-r0 apk -php84-tokenizer 8.4.14-r0 apk -php84-xml 8.4.14-r0 apk -php84-xmlwriter 8.4.14-r0 apk -php84-zip 8.4.14-r0 apk +php84-phar 8.4.16-r0 apk +php84-session 8.4.16-r0 apk +php84-simplexml 8.4.16-r0 apk +php84-tokenizer 8.4.16-r0 apk +php84-xml 8.4.16-r0 apk +php84-xmlwriter 8.4.16-r0 apk +php84-zip 8.4.16-r0 apk phpmyadmin 5.2.3 npm phpmyadmin/motranslator 5.4.0 php-composer phpmyadmin/shapefile 3.0.2 php-composer From 8ac2e21838a4dd34764822c525e3d910b1034224 Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 28 Dec 2025 22:01:22 +0000 Subject: [PATCH 60/85] Rebase to 3.23 --- Dockerfile | 27 +++++++++++++-------------- Dockerfile.aarch64 | 27 +++++++++++++-------------- README.md | 1 + readme-vars.yml | 1 + 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Dockerfile b/Dockerfile index d2a2a0e..6b3782a 100644 --- a/Dockerfile +++ b/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 \ - 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 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8511001..eacb3e6 100644 --- a/Dockerfile.aarch64 +++ b/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 \ - 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 \ diff --git a/README.md b/README.md index f049ddc..425cf84 100644 --- a/README.md +++ b/README.md @@ -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. diff --git a/readme-vars.yml b/readme-vars.yml index 4303e43..aea22d6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -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."} From 4f30796c5ce92e98d61a0596b3a4770eb391b9cf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 2 Jan 2026 21:35:26 +0000 Subject: [PATCH 61/85] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 92f6e97..88fcea9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,7 +22,7 @@ ca-certificates 20250911-r0 apk ca-certificates-bundle 20250911-r0 apk catatonit 0.2.1-r0 apk code-lts/u2f-php-server v1.2.2 php-composer -composer 2.9.2 binary +composer 2.9.3 binary composer/ca-bundle 1.5.8 php-composer coreutils 9.7-r1 apk coreutils-env 9.7-r1 apk From 4eaf850b64ae3cce0006c89f18d956a8bcab6bba Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 4 Jan 2026 21:10:10 +0000 Subject: [PATCH 62/85] Bot Updating Templated Files --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index aea22d6..051aa7f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -90,7 +90,7 @@ 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 From eb337d72cbc83849d8c1454792aad4f0bb4e3281 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 4 Jan 2026 21:13:00 +0000 Subject: [PATCH 63/85] Bot Updating Package Versions --- package_versions.txt | 160 +++++++++++++++++++++---------------------- 1 file changed, 80 insertions(+), 80 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 88fcea9..4f437ff 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,121 +1,121 @@ NAME VERSION TYPE acl-libs 2.3.2-r1 apk -alpine-baselayout 3.7.0-r0 apk -alpine-baselayout-data 3.7.0-r0 apk -alpine-keys 2.5-r0 apk -alpine-release 3.22.2-r0 apk -aom-libs 3.12.1-r0 apk +alpine-baselayout 3.7.1-r8 apk +alpine-baselayout-data 3.7.1-r8 apk +alpine-keys 2.6-r0 apk +alpine-release 3.23.2-r0 apk +aom-libs 3.13.1-r0 apk apache2-utils 2.4.66-r0 apk -apk-tools 2.14.9-r3 apk -apr 1.7.5-r0 apk -apr-util 1.6.3-r1 apk +apk-tools 3.0.3-r1 apk +apr 1.7.6-r0 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 -busybox 1.37.0-r20 apk -busybox-binsh 1.37.0-r20 apk +brotli-libs 1.2.0-r0 apk +busybox 1.37.0-r30 apk +busybox-binsh 1.37.0-r30 apk c-ares 1.34.6-r0 apk -ca-certificates 20250911-r0 apk -ca-certificates-bundle 20250911-r0 apk +ca-certificates 20251003-r0 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.9.3 binary composer/ca-bundle 1.5.8 php-composer -coreutils 9.7-r1 apk -coreutils-env 9.7-r1 apk -coreutils-fmt 9.7-r1 apk -coreutils-sha512sum 9.7-r1 apk -curl 8.14.1-r2 apk +coreutils 9.8-r1 apk +coreutils-env 9.8-r1 apk +coreutils-fmt 9.8-r1 apk +coreutils-sha512sum 9.8-r1 apk +curl 8.17.0-r1 apk 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 -git 2.49.1-r0 apk -git-init-template 2.49.1-r0 apk +freetype 2.14.1-r0 apk +git 2.52.0-r0 apk +git-init-template 2.52.0-r0 apk google/recaptcha 1.2.4 php-composer 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-r3 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.4-r0 apk -libcurl 8.14.1-r2 apk -libdav1d 1.5.1-r0 apk -libedit 20250104.3.1-r1 apk +libcurl 8.17.0-r1 apk +libdav1d 1.5.2-r0 apk +libedit 20251016.3.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 -libintl 0.24.1-r0 apk -libjpeg-turbo 3.1.0-r0 apk +libidn2 2.3.8-r0 apk +libintl 0.24.1-r1 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.53-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 -libsm 1.2.5-r0 apk +libsharpyuv 1.6.0-r0 apk +libsm 1.2.6-r0 apk libssl3 3.5.4-r0 apk -libstdc++ 14.2.0-r6 apk -libunistring 1.3-r0 apk -libuuid 2.41-r9 apk -libwebp 1.5.0-r0 apk -libx11 1.8.11-r0 apk +libstdc++ 15.2.0-r2 apk +libunistring 1.4.1-r0 apk +libuuid 2.41.2-r0 apk +libwebp 1.6.0-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.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 -linux-pam 1.7.0-r4 apk -logrotate 3.21.0-r1 apk -musl 1.2.5-r10 apk -musl-utils 1.2.5-r10 apk -nano 8.4-r0 apk -ncurses-terminfo-base 6.5_p20250503-r0 apk -netcat-openbsd 1.229.1-r0 apk -nghttp2-libs 1.65.0-r0 apk -nginx 1.28.0-r3 apk +libzip 1.11.4-r1 apk +linux-pam 1.7.1-r1 apk +logrotate 3.22.0-r0 apk +musl 1.2.5-r21 apk +musl-utils 1.2.5-r21 apk +nano 8.7-r0 apk +ncurses-terminfo-base 6.5_p20251123-r0 apk +netcat-openbsd 1.234.1-r0 apk +nghttp2-libs 1.68.0-r0 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.4-r0 apk paragonie/constant_time_encoding v2.8.2 php-composer paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.23.0 php-composer -pcre2 10.46-r0 apk -php84 8.4.16-r0 apk -php84-bz2 8.4.16-r0 apk -php84-common 8.4.16-r0 apk -php84-ctype 8.4.16-r0 apk -php84-curl 8.4.16-r0 apk -php84-dom 8.4.16-r0 apk -php84-fileinfo 8.4.16-r0 apk -php84-fpm 8.4.16-r0 apk -php84-gd 8.4.16-r0 apk -php84-iconv 8.4.16-r0 apk -php84-mbstring 8.4.16-r0 apk -php84-mysqli 8.4.16-r0 apk -php84-mysqlnd 8.4.16-r0 apk -php84-opcache 8.4.16-r0 apk -php84-openssl 8.4.16-r0 apk -php84-pecl-uploadprogress 2.0.2-r2 apk -php84-phar 8.4.16-r0 apk -php84-session 8.4.16-r0 apk -php84-simplexml 8.4.16-r0 apk -php84-tokenizer 8.4.16-r0 apk -php84-xml 8.4.16-r0 apk -php84-xmlwriter 8.4.16-r0 apk -php84-zip 8.4.16-r0 apk +pcre2 10.47-r0 apk +php85 8.5.1-r0 apk +php85-bz2 8.5.1-r0 apk +php85-common 8.5.1-r0 apk +php85-ctype 8.5.1-r0 apk +php85-curl 8.5.1-r0 apk +php85-dom 8.5.1-r0 apk +php85-fileinfo 8.5.1-r0 apk +php85-fpm 8.5.1-r0 apk +php85-gd 8.5.1-r0 apk +php85-iconv 8.5.1-r0 apk +php85-mbstring 8.5.1-r0 apk +php85-mysqli 8.5.1-r0 apk +php85-mysqlnd 8.5.1-r0 apk +php85-openssl 8.5.1-r0 apk +php85-pecl-uploadprogress 2.0.2-r1 apk +php85-phar 8.5.1-r0 apk +php85-session 8.5.1-r0 apk +php85-simplexml 8.5.1-r0 apk +php85-tokenizer 8.5.1-r0 apk +php85-xml 8.5.1-r0 apk +php85-xmlwriter 8.5.1-r0 apk +php85-zip 8.5.1-r0 apk phpmyadmin 5.2.3 npm phpmyadmin/motranslator 5.4.0 php-composer phpmyadmin/shapefile 3.0.2 php-composer @@ -124,7 +124,7 @@ phpmyadmin/twig-i18n-extension 4.1.5 php-composer popt 1.19-r4 apk 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 -scanelf 1.3.8-r1 apk -shadow 4.17.3-r0 apk +readline 8.3.1-r0 apk +scanelf 1.3.8-r2 apk +shadow 4.18.0-r0 apk skalibs-libs 2.14.4.0-r0 apk 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-r20 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 @@ -171,4 +171,4 @@ webmozart/assert 1.11.0 php-composer williamdes/mariadb-mysql-kbs v1.3.0 php-composer xz-libs 5.8.1-r0 apk zlib 1.3.1-r2 apk -zstd-libs 1.5.7-r0 apk +zstd-libs 1.5.7-r2 apk From 9b25ea009937c6cf7e15be397ddc31be58d801eb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 9 Jan 2026 21:41:08 +0000 Subject: [PATCH 64/85] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 4f437ff..7788c58 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -77,7 +77,7 @@ libxpm 3.5.17-r0 apk libxt 1.3.1-r0 apk libyuv 0.0.1887.20251502-r1 apk libzip 1.11.4-r1 apk -linux-pam 1.7.1-r1 apk +linux-pam 1.7.1-r2 apk logrotate 3.22.0-r0 apk musl 1.2.5-r21 apk musl-utils 1.2.5-r21 apk From fb815113e550c26663eee3086d96426ce06b5860 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 23 Jan 2026 21:42:10 +0000 Subject: [PATCH 65/85] Bot Updating Package Versions --- package_versions.txt | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7788c58..916635d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,7 +22,7 @@ ca-certificates 20251003-r0 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.9.3 binary +composer 2.9.4 binary composer/ca-bundle 1.5.8 php-composer coreutils 9.8-r1 apk coreutils-env 9.8-r1 apk @@ -57,7 +57,7 @@ libintl 0.24.1-r1 apk libjpeg-turbo 3.1.2-r0 apk libmd 1.1.0-r0 apk libncursesw 6.5_p20251123-r0 apk -libpng 1.6.53-r0 apk +libpng 1.6.54-r0 apk libproc2 4.0.5-r0 apk libpsl 0.21.5-r3 apk libsharpyuv 1.6.0-r0 apk @@ -94,28 +94,28 @@ paragonie/constant_time_encoding v2.8.2 php-composer paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.23.0 php-composer pcre2 10.47-r0 apk -php85 8.5.1-r0 apk -php85-bz2 8.5.1-r0 apk -php85-common 8.5.1-r0 apk -php85-ctype 8.5.1-r0 apk -php85-curl 8.5.1-r0 apk -php85-dom 8.5.1-r0 apk -php85-fileinfo 8.5.1-r0 apk -php85-fpm 8.5.1-r0 apk -php85-gd 8.5.1-r0 apk -php85-iconv 8.5.1-r0 apk -php85-mbstring 8.5.1-r0 apk -php85-mysqli 8.5.1-r0 apk -php85-mysqlnd 8.5.1-r0 apk -php85-openssl 8.5.1-r0 apk +php85 8.5.2-r0 apk +php85-bz2 8.5.2-r0 apk +php85-common 8.5.2-r0 apk +php85-ctype 8.5.2-r0 apk +php85-curl 8.5.2-r0 apk +php85-dom 8.5.2-r0 apk +php85-fileinfo 8.5.2-r0 apk +php85-fpm 8.5.2-r0 apk +php85-gd 8.5.2-r0 apk +php85-iconv 8.5.2-r0 apk +php85-mbstring 8.5.2-r0 apk +php85-mysqli 8.5.2-r0 apk +php85-mysqlnd 8.5.2-r0 apk +php85-openssl 8.5.2-r0 apk php85-pecl-uploadprogress 2.0.2-r1 apk -php85-phar 8.5.1-r0 apk -php85-session 8.5.1-r0 apk -php85-simplexml 8.5.1-r0 apk -php85-tokenizer 8.5.1-r0 apk -php85-xml 8.5.1-r0 apk -php85-xmlwriter 8.5.1-r0 apk -php85-zip 8.5.1-r0 apk +php85-phar 8.5.2-r0 apk +php85-session 8.5.2-r0 apk +php85-simplexml 8.5.2-r0 apk +php85-tokenizer 8.5.2-r0 apk +php85-xml 8.5.2-r0 apk +php85-xmlwriter 8.5.2-r0 apk +php85-zip 8.5.2-r0 apk phpmyadmin 5.2.3 npm phpmyadmin/motranslator 5.4.0 php-composer phpmyadmin/shapefile 3.0.2 php-composer @@ -169,6 +169,6 @@ 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-r2 apk From c20dbc25df438b6339d018633b288e8030704151 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 30 Jan 2026 21:47:34 +0000 Subject: [PATCH 66/85] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 916635d..6904995 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,7 +22,7 @@ ca-certificates 20251003-r0 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.9.4 binary +composer 2.9.5 binary composer/ca-bundle 1.5.8 php-composer coreutils 9.8-r1 apk coreutils-env 9.8-r1 apk @@ -45,7 +45,7 @@ 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.4-r0 apk +libcrypto3 3.5.5-r0 apk libcurl 8.17.0-r1 apk libdav1d 1.5.2-r0 apk libedit 20251016.3.1-r0 apk @@ -62,7 +62,7 @@ libproc2 4.0.5-r0 apk libpsl 0.21.5-r3 apk libsharpyuv 1.6.0-r0 apk libsm 1.2.6-r0 apk -libssl3 3.5.4-r0 apk +libssl3 3.5.5-r0 apk libstdc++ 15.2.0-r2 apk libunistring 1.4.1-r0 apk libuuid 2.41.2-r0 apk @@ -89,7 +89,7 @@ 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.4-r0 apk +openssl 3.5.5-r0 apk paragonie/constant_time_encoding v2.8.2 php-composer paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.23.0 php-composer From e4b3d3ccd3900b3290b15130468d71f0cd877750 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 6 Feb 2026 21:51:21 +0000 Subject: [PATCH 67/85] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6904995..e2e0830 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,8 +3,8 @@ acl-libs 2.3.2-r1 apk alpine-baselayout 3.7.1-r8 apk alpine-baselayout-data 3.7.1-r8 apk alpine-keys 2.6-r0 apk -alpine-release 3.23.2-r0 apk -aom-libs 3.13.1-r0 apk +alpine-release 3.23.3-r0 apk +aom-libs 3.13.1-r1 apk apache2-utils 2.4.66-r0 apk apk-tools 3.0.3-r1 apk apr 1.7.6-r0 apk @@ -49,7 +49,7 @@ libcrypto3 3.5.5-r0 apk libcurl 8.17.0-r1 apk libdav1d 1.5.2-r0 apk libedit 20251016.3.1-r0 apk -libexpat 2.7.3-r0 apk +libexpat 2.7.4-r0 apk libgcc 15.2.0-r2 apk libice 1.1.2-r0 apk libidn2 2.3.8-r0 apk @@ -86,7 +86,7 @@ ncurses-terminfo-base 6.5_p20251123-r0 apk netcat-openbsd 1.234.1-r0 apk nghttp2-libs 1.68.0-r0 apk nghttp3 1.13.1-r0 apk -nginx 1.28.0-r8 apk +nginx 1.28.2-r0 apk nikic/fast-route v1.3.0 php-composer oniguruma 6.9.10-r0 apk openssl 3.5.5-r0 apk From a0d4355e864e6c3cab229657a92f9e23b21191f3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 13 Feb 2026 21:56:33 +0000 Subject: [PATCH 68/85] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 22d8b8f..70026dc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -286,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 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + ghcr.io/linuxserver/baseimage-alpine:3.23 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 && \ From 56055aa6a06a83ee9e45dd391d4b2fd2c761770f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 13 Feb 2026 21:58:35 +0000 Subject: [PATCH 69/85] Bot Updating Templated Files --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 425cf84..0b980d0 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ This image can be run with a non-root user. For details please [read the docs](h To help you get started creating a container from this image you can either use docker-compose or the docker cli. >[!NOTE] ->Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided. +>Unless a parameter is flagged as 'optional', it is *mandatory* and a value must be provided. ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose)) From c0059dbb4c368541ccae453cb38cdf8b7945efbc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 13 Feb 2026 22:01:36 +0000 Subject: [PATCH 70/85] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e2e0830..a60bc74 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ alpine-keys 2.6-r0 apk alpine-release 3.23.3-r0 apk aom-libs 3.13.1-r1 apk apache2-utils 2.4.66-r0 apk -apk-tools 3.0.3-r1 apk +apk-tools 3.0.4-r0 apk apr 1.7.6-r0 apk apr-util 1.6.3-r2 apk argon2-libs 20190702-r5 apk @@ -40,7 +40,7 @@ google/recaptcha 1.2.4 php-composer jq 1.8.1-r0 apk league/uri 6.4.0 php-composer league/uri-interfaces 2.3.0 php-composer -libapk 3.0.3-r1 apk +libapk 3.0.4-r0 apk libattr 2.5.2-r2 apk libavif 1.3.0-r0 apk libbsd 0.12.2-r0 apk From be1be5ac97109b30c81b110acae7382ae208aa2a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 27 Feb 2026 21:50:20 +0000 Subject: [PATCH 71/85] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a60bc74..fe43921 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -57,7 +57,7 @@ libintl 0.24.1-r1 apk libjpeg-turbo 3.1.2-r0 apk libmd 1.1.0-r0 apk libncursesw 6.5_p20251123-r0 apk -libpng 1.6.54-r0 apk +libpng 1.6.55-r0 apk libproc2 4.0.5-r0 apk libpsl 0.21.5-r3 apk libsharpyuv 1.6.0-r0 apk @@ -86,7 +86,7 @@ ncurses-terminfo-base 6.5_p20251123-r0 apk netcat-openbsd 1.234.1-r0 apk nghttp2-libs 1.68.0-r0 apk nghttp3 1.13.1-r0 apk -nginx 1.28.2-r0 apk +nginx 1.28.2-r1 apk nikic/fast-route v1.3.0 php-composer oniguruma 6.9.10-r0 apk openssl 3.5.5-r0 apk From 4aae8f22cef77bcb2d71066c5fc145c90c381c4d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 6 Mar 2026 21:50:39 +0000 Subject: [PATCH 72/85] Bot Updating Package Versions --- package_versions.txt | 46 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index fe43921..e3d5e47 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ alpine-keys 2.6-r0 apk alpine-release 3.23.3-r0 apk aom-libs 3.13.1-r1 apk apache2-utils 2.4.66-r0 apk -apk-tools 3.0.4-r0 apk +apk-tools 3.0.5-r0 apk apr 1.7.6-r0 apk apr-util 1.6.3-r2 apk argon2-libs 20190702-r5 apk @@ -40,7 +40,7 @@ google/recaptcha 1.2.4 php-composer jq 1.8.1-r0 apk league/uri 6.4.0 php-composer league/uri-interfaces 2.3.0 php-composer -libapk 3.0.4-r0 apk +libapk 3.0.5-r0 apk libattr 2.5.2-r2 apk libavif 1.3.0-r0 apk libbsd 0.12.2-r0 apk @@ -94,28 +94,28 @@ paragonie/constant_time_encoding v2.8.2 php-composer paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.23.0 php-composer pcre2 10.47-r0 apk -php85 8.5.2-r0 apk -php85-bz2 8.5.2-r0 apk -php85-common 8.5.2-r0 apk -php85-ctype 8.5.2-r0 apk -php85-curl 8.5.2-r0 apk -php85-dom 8.5.2-r0 apk -php85-fileinfo 8.5.2-r0 apk -php85-fpm 8.5.2-r0 apk -php85-gd 8.5.2-r0 apk -php85-iconv 8.5.2-r0 apk -php85-mbstring 8.5.2-r0 apk -php85-mysqli 8.5.2-r0 apk -php85-mysqlnd 8.5.2-r0 apk -php85-openssl 8.5.2-r0 apk +php85 8.5.3-r0 apk +php85-bz2 8.5.3-r0 apk +php85-common 8.5.3-r0 apk +php85-ctype 8.5.3-r0 apk +php85-curl 8.5.3-r0 apk +php85-dom 8.5.3-r0 apk +php85-fileinfo 8.5.3-r0 apk +php85-fpm 8.5.3-r0 apk +php85-gd 8.5.3-r0 apk +php85-iconv 8.5.3-r0 apk +php85-mbstring 8.5.3-r0 apk +php85-mysqli 8.5.3-r0 apk +php85-mysqlnd 8.5.3-r0 apk +php85-openssl 8.5.3-r0 apk php85-pecl-uploadprogress 2.0.2-r1 apk -php85-phar 8.5.2-r0 apk -php85-session 8.5.2-r0 apk -php85-simplexml 8.5.2-r0 apk -php85-tokenizer 8.5.2-r0 apk -php85-xml 8.5.2-r0 apk -php85-xmlwriter 8.5.2-r0 apk -php85-zip 8.5.2-r0 apk +php85-phar 8.5.3-r0 apk +php85-session 8.5.3-r0 apk +php85-simplexml 8.5.3-r0 apk +php85-tokenizer 8.5.3-r0 apk +php85-xml 8.5.3-r0 apk +php85-xmlwriter 8.5.3-r0 apk +php85-zip 8.5.3-r0 apk phpmyadmin 5.2.3 npm phpmyadmin/motranslator 5.4.0 php-composer phpmyadmin/shapefile 3.0.2 php-composer From 484ac3d9989c944e13b15893b9437cea36deb8cb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 13 Mar 2026 21:54:46 +0000 Subject: [PATCH 73/85] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index e3d5e47..b59741c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -162,7 +162,7 @@ symfony/var-exporter v5.4.45 php-composer tecnickcom/tcpdf 6.10.0 php-composer thecodingmachine/safe v1.3.3.1 php-composer twig/twig v3.11.3 php-composer -tzdata 2025c-r0 apk +tzdata 2026a-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 @@ -170,5 +170,5 @@ 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.2-r0 apk -zlib 1.3.1-r2 apk +zlib 1.3.2-r0 apk zstd-libs 1.5.7-r2 apk From 19782f79fb2d45753b93b185e78205ba629a79b8 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 20 Mar 2026 21:52:05 +0000 Subject: [PATCH 74/85] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b59741c..80e3b2f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -49,7 +49,7 @@ libcrypto3 3.5.5-r0 apk libcurl 8.17.0-r1 apk libdav1d 1.5.2-r0 apk libedit 20251016.3.1-r0 apk -libexpat 2.7.4-r0 apk +libexpat 2.7.5-r0 apk libgcc 15.2.0-r2 apk libice 1.1.2-r0 apk libidn2 2.3.8-r0 apk From 329557bb275bf2f25e6d4b4c9c3383e84d470b76 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 27 Mar 2026 21:56:39 +0000 Subject: [PATCH 75/85] Bot Updating Package Versions --- package_versions.txt | 46 ++++++++++++++++++++++---------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 80e3b2f..2737a38 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -57,7 +57,7 @@ libintl 0.24.1-r1 apk libjpeg-turbo 3.1.2-r0 apk libmd 1.1.0-r0 apk libncursesw 6.5_p20251123-r0 apk -libpng 1.6.55-r0 apk +libpng 1.6.56-r0 apk libproc2 4.0.5-r0 apk libpsl 0.21.5-r3 apk libsharpyuv 1.6.0-r0 apk @@ -86,7 +86,7 @@ ncurses-terminfo-base 6.5_p20251123-r0 apk netcat-openbsd 1.234.1-r0 apk nghttp2-libs 1.68.0-r0 apk nghttp3 1.13.1-r0 apk -nginx 1.28.2-r1 apk +nginx 1.28.3-r0 apk nikic/fast-route v1.3.0 php-composer oniguruma 6.9.10-r0 apk openssl 3.5.5-r0 apk @@ -94,28 +94,28 @@ paragonie/constant_time_encoding v2.8.2 php-composer paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.23.0 php-composer pcre2 10.47-r0 apk -php85 8.5.3-r0 apk -php85-bz2 8.5.3-r0 apk -php85-common 8.5.3-r0 apk -php85-ctype 8.5.3-r0 apk -php85-curl 8.5.3-r0 apk -php85-dom 8.5.3-r0 apk -php85-fileinfo 8.5.3-r0 apk -php85-fpm 8.5.3-r0 apk -php85-gd 8.5.3-r0 apk -php85-iconv 8.5.3-r0 apk -php85-mbstring 8.5.3-r0 apk -php85-mysqli 8.5.3-r0 apk -php85-mysqlnd 8.5.3-r0 apk -php85-openssl 8.5.3-r0 apk +php85 8.5.4-r0 apk +php85-bz2 8.5.4-r0 apk +php85-common 8.5.4-r0 apk +php85-ctype 8.5.4-r0 apk +php85-curl 8.5.4-r0 apk +php85-dom 8.5.4-r0 apk +php85-fileinfo 8.5.4-r0 apk +php85-fpm 8.5.4-r0 apk +php85-gd 8.5.4-r0 apk +php85-iconv 8.5.4-r0 apk +php85-mbstring 8.5.4-r0 apk +php85-mysqli 8.5.4-r0 apk +php85-mysqlnd 8.5.4-r0 apk +php85-openssl 8.5.4-r0 apk php85-pecl-uploadprogress 2.0.2-r1 apk -php85-phar 8.5.3-r0 apk -php85-session 8.5.3-r0 apk -php85-simplexml 8.5.3-r0 apk -php85-tokenizer 8.5.3-r0 apk -php85-xml 8.5.3-r0 apk -php85-xmlwriter 8.5.3-r0 apk -php85-zip 8.5.3-r0 apk +php85-phar 8.5.4-r0 apk +php85-session 8.5.4-r0 apk +php85-simplexml 8.5.4-r0 apk +php85-tokenizer 8.5.4-r0 apk +php85-xml 8.5.4-r0 apk +php85-xmlwriter 8.5.4-r0 apk +php85-zip 8.5.4-r0 apk phpmyadmin 5.2.3 npm phpmyadmin/motranslator 5.4.0 php-composer phpmyadmin/shapefile 3.0.2 php-composer From 4c6737e5b7e1c258c88aa77d07084c03f3c30e0d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 3 Apr 2026 21:55:48 +0000 Subject: [PATCH 76/85] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 2737a38..dfd8f68 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ NAME VERSION TYPE acl-libs 2.3.2-r1 apk -alpine-baselayout 3.7.1-r8 apk -alpine-baselayout-data 3.7.1-r8 apk +alpine-baselayout 3.7.2-r0 apk +alpine-baselayout-data 3.7.2-r0 apk alpine-keys 2.6-r0 apk alpine-release 3.23.3-r0 apk aom-libs 3.13.1-r1 apk From 24e4a2094bf5f0ff42eefc5979fa9bd869264119 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 10 Apr 2026 22:00:43 +0000 Subject: [PATCH 77/85] Bot Updating Templated Files --- Jenkinsfile | 172 ++++++++++++++++++++++++++-------------------------- 1 file changed, 85 insertions(+), 87 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 70026dc..bba59b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -78,6 +78,7 @@ pipeline { ''' script{ env.EXIT_STATUS = '' + env.CI_TEST_ATTEMPTED = '' env.LS_RELEASE = sh( script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() @@ -874,6 +875,7 @@ pipeline { script{ env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html' env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json' + env.CI_TEST_ATTEMPTED = 'true' } sh '''#! /bin/bash set -e @@ -1076,98 +1078,13 @@ EOF ) ''' } } - // If this is a Pull request send the CI link as a comment on it - stage('Pull Request Comment') { - when { - not {environment name: 'CHANGE_ID', value: ''} - environment name: 'EXIT_STATUS', value: '' - } - steps { - sh '''#! /bin/bash - # Function to retrieve JSON data from URL - get_json() { - local url="$1" - local response=$(curl -s "$url") - if [ $? -ne 0 ]; then - echo "Failed to retrieve JSON data from $url" - return 1 - fi - local json=$(echo "$response" | jq .) - if [ $? -ne 0 ]; then - echo "Failed to parse JSON data from $url" - return 1 - fi - echo "$json" - } - - build_table() { - local data="$1" - - # Get the keys in the JSON data - local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]') - - # Check if keys are empty - if [ -z "$keys" ]; then - echo "JSON report data does not contain any keys or the report does not exist." - return 1 - fi - - # Build table header - local header="| Tag | Passed |\\n| --- | --- |\\n" - - # Loop through the JSON data to build the table rows - local rows="" - for build in $keys; do - local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success") - if [ "$status" = "true" ]; then - status="✅" - else - status="❌" - fi - local row="| "$build" | "$status" |\\n" - rows="${rows}${row}" - done - - local table="${header}${rows}" - local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g') - echo "$escaped_table" - } - - if [[ "${CI}" = "true" ]]; then - # Retrieve JSON data from URL - data=$(get_json "$CI_JSON_URL") - # Create table from JSON data - table=$(build_table "$data") - echo -e "$table" - - curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ - -H "Accept: application/vnd.github.v3+json" \ - "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" - else - curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ - -H "Accept: application/vnd.github.v3+json" \ - "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" - fi - ''' - - } - } } /* ###################### - Send status to Discord + Comment on PR and Send status to Discord ###################### */ post { always { - sh '''#!/bin/bash - rm -rf /config/.ssh/id_sign - rm -rf /config/.ssh/id_sign.pub - git config --global --unset gpg.format - git config --global --unset user.signingkey - git config --global --unset commit.gpgsign - ''' - script{ + script { env.JOB_DATE = sh( script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', returnStdout: true).trim() @@ -1210,6 +1127,87 @@ EOF "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } } + script { + if (env.GITHUBIMAGE =~ /lspipepr/){ + if (env.CI_TEST_ATTEMPTED == "true"){ + sh '''#! /bin/bash + # Function to retrieve JSON data from URL + get_json() { + local url="$1" + local response=$(curl -s "$url") + if [ $? -ne 0 ]; then + echo "Failed to retrieve JSON data from $url" + return 1 + fi + local json=$(echo "$response" | jq .) + if [ $? -ne 0 ]; then + echo "Failed to parse JSON data from $url" + return 1 + fi + echo "$json" + } + + build_table() { + local data="$1" + + # Get the keys in the JSON data + local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]') + + # Check if keys are empty + if [ -z "$keys" ]; then + echo "JSON report data does not contain any keys or the report does not exist." + return 1 + fi + + # Build table header + local header="| Tag | Passed |\\n| --- | --- |\\n" + + # Loop through the JSON data to build the table rows + local rows="" + for build in $keys; do + local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success") + if [ "$status" = "true" ]; then + status="✅" + else + status="❌" + fi + local row="| "$build" | "$status" |\\n" + rows="${rows}${row}" + done + + local table="${header}${rows}" + local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g') + echo "$escaped_table" + } + + if [[ "${CI}" = "true" ]]; then + # Retrieve JSON data from URL + data=$(get_json "$CI_JSON_URL") + # Create table from JSON data + table=$(build_table "$data") + echo -e "$table" + + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" + else + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" + fi + ''' + } + } + } + sh '''#!/bin/bash + rm -rf /config/.ssh/id_sign + rm -rf /config/.ssh/id_sign.pub + git config --global --unset gpg.format + git config --global --unset user.signingkey + git config --global --unset commit.gpgsign + ''' } cleanup { sh '''#! /bin/bash From 0deb40147a9d2ba9a6443533d24582258290e69e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 10 Apr 2026 22:03:49 +0000 Subject: [PATCH 78/85] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index dfd8f68..8133e0a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -57,7 +57,7 @@ libintl 0.24.1-r1 apk libjpeg-turbo 3.1.2-r0 apk libmd 1.1.0-r0 apk libncursesw 6.5_p20251123-r0 apk -libpng 1.6.56-r0 apk +libpng 1.6.57-r0 apk libproc2 4.0.5-r0 apk libpsl 0.21.5-r3 apk libsharpyuv 1.6.0-r0 apk @@ -65,7 +65,7 @@ libsm 1.2.6-r0 apk libssl3 3.5.5-r0 apk libstdc++ 15.2.0-r2 apk libunistring 1.4.1-r0 apk -libuuid 2.41.2-r0 apk +libuuid 2.41.4-r0 apk libwebp 1.6.0-r0 apk libx11 1.8.12-r1 apk libxau 1.0.12-r0 apk From b107dfac3de06fd19eb2d7d1175449e8f6989c37 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 17 Apr 2026 22:06:02 +0000 Subject: [PATCH 79/85] Bot Updating Package Versions --- package_versions.txt | 54 ++++++++++++++++++++++---------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8133e0a..c34bd9a 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,7 +22,7 @@ ca-certificates 20251003-r0 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.9.5 binary +composer 2.9.7 binary composer/ca-bundle 1.5.8 php-composer coreutils 9.8-r1 apk coreutils-env 9.8-r1 apk @@ -45,7 +45,7 @@ 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.5-r0 apk +libcrypto3 3.5.6-r0 apk libcurl 8.17.0-r1 apk libdav1d 1.5.2-r0 apk libedit 20251016.3.1-r0 apk @@ -62,7 +62,7 @@ libproc2 4.0.5-r0 apk libpsl 0.21.5-r3 apk libsharpyuv 1.6.0-r0 apk libsm 1.2.6-r0 apk -libssl3 3.5.5-r0 apk +libssl3 3.5.6-r0 apk libstdc++ 15.2.0-r2 apk libunistring 1.4.1-r0 apk libuuid 2.41.4-r0 apk @@ -79,8 +79,8 @@ libyuv 0.0.1887.20251502-r1 apk libzip 1.11.4-r1 apk linux-pam 1.7.1-r2 apk logrotate 3.22.0-r0 apk -musl 1.2.5-r21 apk -musl-utils 1.2.5-r21 apk +musl 1.2.5-r23 apk +musl-utils 1.2.5-r23 apk nano 8.7-r0 apk ncurses-terminfo-base 6.5_p20251123-r0 apk netcat-openbsd 1.234.1-r0 apk @@ -89,33 +89,33 @@ nghttp3 1.13.1-r0 apk nginx 1.28.3-r0 apk nikic/fast-route v1.3.0 php-composer oniguruma 6.9.10-r0 apk -openssl 3.5.5-r0 apk +openssl 3.5.6-r0 apk paragonie/constant_time_encoding v2.8.2 php-composer paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.23.0 php-composer pcre2 10.47-r0 apk -php85 8.5.4-r0 apk -php85-bz2 8.5.4-r0 apk -php85-common 8.5.4-r0 apk -php85-ctype 8.5.4-r0 apk -php85-curl 8.5.4-r0 apk -php85-dom 8.5.4-r0 apk -php85-fileinfo 8.5.4-r0 apk -php85-fpm 8.5.4-r0 apk -php85-gd 8.5.4-r0 apk -php85-iconv 8.5.4-r0 apk -php85-mbstring 8.5.4-r0 apk -php85-mysqli 8.5.4-r0 apk -php85-mysqlnd 8.5.4-r0 apk -php85-openssl 8.5.4-r0 apk +php85 8.5.5-r1 apk +php85-bz2 8.5.5-r1 apk +php85-common 8.5.5-r1 apk +php85-ctype 8.5.5-r1 apk +php85-curl 8.5.5-r1 apk +php85-dom 8.5.5-r1 apk +php85-fileinfo 8.5.5-r1 apk +php85-fpm 8.5.5-r1 apk +php85-gd 8.5.5-r1 apk +php85-iconv 8.5.5-r1 apk +php85-mbstring 8.5.5-r1 apk +php85-mysqli 8.5.5-r1 apk +php85-mysqlnd 8.5.5-r1 apk +php85-openssl 8.5.5-r1 apk php85-pecl-uploadprogress 2.0.2-r1 apk -php85-phar 8.5.4-r0 apk -php85-session 8.5.4-r0 apk -php85-simplexml 8.5.4-r0 apk -php85-tokenizer 8.5.4-r0 apk -php85-xml 8.5.4-r0 apk -php85-xmlwriter 8.5.4-r0 apk -php85-zip 8.5.4-r0 apk +php85-phar 8.5.5-r1 apk +php85-session 8.5.5-r1 apk +php85-simplexml 8.5.5-r1 apk +php85-tokenizer 8.5.5-r1 apk +php85-xml 8.5.5-r1 apk +php85-xmlwriter 8.5.5-r1 apk +php85-zip 8.5.5-r1 apk phpmyadmin 5.2.3 npm phpmyadmin/motranslator 5.4.0 php-composer phpmyadmin/shapefile 3.0.2 php-composer From 0e1cb3073203ff680cf3cd819a3369ef7e2113d7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 24 Apr 2026 22:07:57 +0000 Subject: [PATCH 80/85] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c34bd9a..0588bd1 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -73,7 +73,7 @@ libxcb 1.17.0-r1 apk libxdmcp 1.1.5-r1 apk libxext 1.3.6-r2 apk libxml2 2.13.9-r0 apk -libxpm 3.5.17-r0 apk +libxpm 3.5.19-r0 apk libxt 1.3.1-r0 apk libyuv 0.0.1887.20251502-r1 apk libzip 1.11.4-r1 apk From 027ded91d291af105df0dbb563a10d78237be48b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 1 May 2026 22:11:23 +0000 Subject: [PATCH 81/85] Bot Updating Package Versions --- package_versions.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 0588bd1..afa9b23 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -3,10 +3,10 @@ acl-libs 2.3.2-r1 apk alpine-baselayout 3.7.2-r0 apk alpine-baselayout-data 3.7.2-r0 apk alpine-keys 2.6-r0 apk -alpine-release 3.23.3-r0 apk +alpine-release 3.23.4-r0 apk aom-libs 3.13.1-r1 apk apache2-utils 2.4.66-r0 apk -apk-tools 3.0.5-r0 apk +apk-tools 3.0.6-r0 apk apr 1.7.6-r0 apk apr-util 1.6.3-r2 apk argon2-libs 20190702-r5 apk @@ -18,8 +18,8 @@ brotli-libs 1.2.0-r0 apk busybox 1.37.0-r30 apk busybox-binsh 1.37.0-r30 apk c-ares 1.34.6-r0 apk -ca-certificates 20251003-r0 apk -ca-certificates-bundle 20251003-r0 apk +ca-certificates 20260413-r0 apk +ca-certificates-bundle 20260413-r0 apk catatonit 0.2.1-r0 apk code-lts/u2f-php-server v1.2.2 php-composer composer 2.9.7 binary @@ -40,7 +40,7 @@ google/recaptcha 1.2.4 php-composer jq 1.8.1-r0 apk league/uri 6.4.0 php-composer league/uri-interfaces 2.3.0 php-composer -libapk 3.0.5-r0 apk +libapk 3.0.6-r0 apk libattr 2.5.2-r2 apk libavif 1.3.0-r0 apk libbsd 0.12.2-r0 apk @@ -169,6 +169,6 @@ 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.2-r0 apk +xz-libs 5.8.3-r0 apk zlib 1.3.2-r0 apk zstd-libs 1.5.7-r2 apk From bf4f9943675475c48d44ac40c1b824969837fcb9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 8 May 2026 22:30:01 +0000 Subject: [PATCH 82/85] Bot Updating Templated Files --- Jenkinsfile | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bba59b0..7287564 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -79,6 +79,7 @@ pipeline { script{ env.EXIT_STATUS = '' env.CI_TEST_ATTEMPTED = '' + env.PUSH_ATTEMPTED = '' env.LS_RELEASE = sh( script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', returnStdout: true).trim() @@ -928,6 +929,9 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { + script{ + env.PUSH_ATTEMPTED = 'true' + } retry_backoff(5,5) { sh '''#! /bin/bash set -e @@ -957,11 +961,18 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { + script{ + env.PUSH_ATTEMPTED = 'true' + } retry_backoff(5,5) { sh '''#! /bin/bash set -e for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}" + if [[ "${MANIFESTIMAGE%%/*}" =~ \\. ]]; then + MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" + else + MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}" + fi IFS=',' read -ra CACHE <<< "$BUILDCACHE" for i in "${CACHE[@]}"; do if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then @@ -1129,7 +1140,7 @@ EOF } script { if (env.GITHUBIMAGE =~ /lspipepr/){ - if (env.CI_TEST_ATTEMPTED == "true"){ + if (env.CI_TEST_ATTEMPTED == "true" || env.PUSH_ATTEMPTED == "true"){ sh '''#! /bin/bash # Function to retrieve JSON data from URL get_json() { @@ -1190,14 +1201,21 @@ EOF curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ -H "Accept: application/vnd.github.v3+json" \ "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" + -d "{\\"body\\": \\"I am a bot, here are the test results for this PR for commit ${COMMIT_SHA:0:7} : \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}" else curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ -H "Accept: application/vnd.github.v3+json" \ "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ - -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" + -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR for commit ${COMMIT_SHA:0:7} : \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" fi ''' + } else { + sh '''#! /bin/bash + curl -X POST -H "Authorization: token $GITHUB_TOKEN" \ + -H "Accept: application/vnd.github.v3+json" \ + "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \ + -d "{\\"body\\": \\"I am a bot, the build for PR commit ${COMMIT_SHA:0:7} failed and as a result no CI test was attempted and no images were pushed.\\"}" + ''' } } } From 86c31eefebedf7a9b244a7d84754a784e45f2cf6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 8 May 2026 22:33:20 +0000 Subject: [PATCH 83/85] Bot Updating Package Versions --- package_versions.txt | 48 ++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index afa9b23..019e8b6 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -5,7 +5,7 @@ alpine-baselayout-data 3.7.2-r0 apk alpine-keys 2.6-r0 apk alpine-release 3.23.4-r0 apk aom-libs 3.13.1-r1 apk -apache2-utils 2.4.66-r0 apk +apache2-utils 2.4.67-r0 apk apk-tools 3.0.6-r0 apk apr 1.7.6-r0 apk apr-util 1.6.3-r2 apk @@ -84,7 +84,7 @@ musl-utils 1.2.5-r23 apk nano 8.7-r0 apk ncurses-terminfo-base 6.5_p20251123-r0 apk netcat-openbsd 1.234.1-r0 apk -nghttp2-libs 1.68.0-r0 apk +nghttp2-libs 1.69.0-r0 apk nghttp3 1.13.1-r0 apk nginx 1.28.3-r0 apk nikic/fast-route v1.3.0 php-composer @@ -94,28 +94,28 @@ paragonie/constant_time_encoding v2.8.2 php-composer paragonie/random_compat v9.99.100 php-composer paragonie/sodium_compat v1.23.0 php-composer pcre2 10.47-r0 apk -php85 8.5.5-r1 apk -php85-bz2 8.5.5-r1 apk -php85-common 8.5.5-r1 apk -php85-ctype 8.5.5-r1 apk -php85-curl 8.5.5-r1 apk -php85-dom 8.5.5-r1 apk -php85-fileinfo 8.5.5-r1 apk -php85-fpm 8.5.5-r1 apk -php85-gd 8.5.5-r1 apk -php85-iconv 8.5.5-r1 apk -php85-mbstring 8.5.5-r1 apk -php85-mysqli 8.5.5-r1 apk -php85-mysqlnd 8.5.5-r1 apk -php85-openssl 8.5.5-r1 apk +php85 8.5.6-r0 apk +php85-bz2 8.5.6-r0 apk +php85-common 8.5.6-r0 apk +php85-ctype 8.5.6-r0 apk +php85-curl 8.5.6-r0 apk +php85-dom 8.5.6-r0 apk +php85-fileinfo 8.5.6-r0 apk +php85-fpm 8.5.6-r0 apk +php85-gd 8.5.6-r0 apk +php85-iconv 8.5.6-r0 apk +php85-mbstring 8.5.6-r0 apk +php85-mysqli 8.5.6-r0 apk +php85-mysqlnd 8.5.6-r0 apk +php85-openssl 8.5.6-r0 apk php85-pecl-uploadprogress 2.0.2-r1 apk -php85-phar 8.5.5-r1 apk -php85-session 8.5.5-r1 apk -php85-simplexml 8.5.5-r1 apk -php85-tokenizer 8.5.5-r1 apk -php85-xml 8.5.5-r1 apk -php85-xmlwriter 8.5.5-r1 apk -php85-zip 8.5.5-r1 apk +php85-phar 8.5.6-r0 apk +php85-session 8.5.6-r0 apk +php85-simplexml 8.5.6-r0 apk +php85-tokenizer 8.5.6-r0 apk +php85-xml 8.5.6-r0 apk +php85-xmlwriter 8.5.6-r0 apk +php85-zip 8.5.6-r0 apk phpmyadmin 5.2.3 npm phpmyadmin/motranslator 5.4.0 php-composer phpmyadmin/shapefile 3.0.2 php-composer @@ -162,7 +162,7 @@ symfony/var-exporter v5.4.45 php-composer tecnickcom/tcpdf 6.10.0 php-composer thecodingmachine/safe v1.3.3.1 php-composer twig/twig v3.11.3 php-composer -tzdata 2026a-r0 apk +tzdata 2026b-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 From 9c7741f69d60368311dc9c844c31bbf4be038ea1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 15 May 2026 22:17:02 +0000 Subject: [PATCH 84/85] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 019e8b6..35d587e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -22,7 +22,7 @@ ca-certificates 20260413-r0 apk ca-certificates-bundle 20260413-r0 apk catatonit 0.2.1-r0 apk code-lts/u2f-php-server v1.2.2 php-composer -composer 2.9.7 binary +composer 2.9.8 binary composer/ca-bundle 1.5.8 php-composer coreutils 9.8-r1 apk coreutils-env 9.8-r1 apk @@ -86,7 +86,7 @@ ncurses-terminfo-base 6.5_p20251123-r0 apk netcat-openbsd 1.234.1-r0 apk nghttp2-libs 1.69.0-r0 apk nghttp3 1.13.1-r0 apk -nginx 1.28.3-r0 apk +nginx 1.28.3-r1 apk nikic/fast-route v1.3.0 php-composer oniguruma 6.9.10-r0 apk openssl 3.5.6-r0 apk From 3ae27881f0d78f752a90d9be174340e8d5dd76dd Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 22 May 2026 22:34:18 +0000 Subject: [PATCH 85/85] Bot Updating Package Versions --- package_versions.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 35d587e..46c1078 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -28,7 +28,7 @@ coreutils 9.8-r1 apk coreutils-env 9.8-r1 apk coreutils-fmt 9.8-r1 apk coreutils-sha512sum 9.8-r1 apk -curl 8.17.0-r1 apk +curl 8.19.0-r0 apk dasprid/enum 1.0.7 php-composer fgrosse/phpasn1 v2.5.0 php-composer fig/http-message-util 1.1.5 php-composer @@ -46,7 +46,7 @@ libavif 1.3.0-r0 apk libbsd 0.12.2-r0 apk libbz2 1.0.8-r6 apk libcrypto3 3.5.6-r0 apk -libcurl 8.17.0-r1 apk +libcurl 8.19.0-r0 apk libdav1d 1.5.2-r0 apk libedit 20251016.3.1-r0 apk libexpat 2.7.5-r0 apk @@ -57,7 +57,7 @@ libintl 0.24.1-r1 apk libjpeg-turbo 3.1.2-r0 apk libmd 1.1.0-r0 apk libncursesw 6.5_p20251123-r0 apk -libpng 1.6.57-r0 apk +libpng 1.6.58-r1 apk libproc2 4.0.5-r0 apk libpsl 0.21.5-r3 apk libsharpyuv 1.6.0-r0 apk @@ -85,7 +85,6 @@ nano 8.7-r0 apk ncurses-terminfo-base 6.5_p20251123-r0 apk netcat-openbsd 1.234.1-r0 apk nghttp2-libs 1.69.0-r0 apk -nghttp3 1.13.1-r0 apk nginx 1.28.3-r1 apk nikic/fast-route v1.3.0 php-composer oniguruma 6.9.10-r0 apk