Bot Updating Package Versions

.github/CONTRIBUTING.md

@@ -105,10 +105,10 @@ docker build \
   -t linuxserver/swag:latest .
 ```
 
-The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
 
 ```bash
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
+docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
 ```
 
 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.

.github/workflows/package_trigger_scheduler.yml

@@ -70,13 +70,14 @@ jobs:
           if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
             if [[ -n "${triggered_branches}" ]]; then
               NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
+              NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-swag/activity/ \n"
+              echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
             fi
             if [[ -n "${skipped_branches}" ]]; then
               NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
             fi
-            echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
             echo "**** Notifying Discord ****"
             curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-              "description": "**Package Check Build(s) Triggered for swag** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-swag/activity/"' \n"}],
+              "description": "**Package Check Build(s) for swag** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}],
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
           fi

Dockerfile

@@ -10,8 +10,10 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="nemchik"
 
 # environment settings
-ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.ini
+ENV DHLEVEL=2048 \
-ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
+  ONLY_SUBDOMAINS=false \
+  AWS_CONFIG_FILE=/config/dns-conf/route53.ini \
+  S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 
 RUN \
   echo "**** install build packages ****" && \

Dockerfile.aarch64

@@ -10,8 +10,10 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="nemchik"
 
 # environment settings
-ENV DHLEVEL=2048 ONLY_SUBDOMAINS=false AWS_CONFIG_FILE=/config/dns-conf/route53.ini
+ENV DHLEVEL=2048 \
-ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
+  ONLY_SUBDOMAINS=false \
+  AWS_CONFIG_FILE=/config/dns-conf/route53.ini \
+  S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 
 RUN \
   echo "**** install build packages ****" && \

Jenkinsfile

@@ -29,12 +29,12 @@ pipeline {
     PR_DOCKERHUB_IMAGE = 'lspipepr/swag'
     DIST_IMAGE = 'alpine'
     MULTIARCH='true'
-    CI='true'
+    CI='false'
     CI_WEB='false'
     CI_PORT='80'
     CI_SSL='false'
     CI_DELAY='30'
-    CI_DOCKERENV='TEST_RUN=1'
+    CI_DOCKERENV=''
     CI_AUTH=''
     CI_WEBPATH=''
   }
@@ -191,6 +191,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'
         }
       }
     }
@@ -215,6 +216,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'
         }
       }
     }
@@ -239,6 +241,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'
         }
       }
     }
@@ -335,6 +338,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 master
+                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 master
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                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}
@@ -543,8 +575,40 @@ pipeline {
           --label \"org.opencontainers.image.title=Swag\" \
           --label \"org.opencontainers.image.description=SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relation to Let's Encrypt™) sets up an Nginx webserver and reverse proxy with php support and a built-in certbot client that automates free SSL server certificate generation and renewal processes (Let's Encrypt and ZeroSSL). It also contains fail2ban for intrusion prevention.\" \
           --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
@@ -575,8 +639,40 @@ pipeline {
               --label \"org.opencontainers.image.title=Swag\" \
               --label \"org.opencontainers.image.description=SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relation to Let's Encrypt™) sets up an Nginx webserver and reverse proxy with php support and a built-in certbot client that automates free SSL server certificate generation and renewal processes (Let's Encrypt and ZeroSSL). It also contains fail2ban for intrusion prevention.\" \
               --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') {
@@ -585,10 +681,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}\" \
@@ -604,18 +696,47 @@ pipeline {
               --label \"org.opencontainers.image.title=Swag\" \
               --label \"org.opencontainers.image.description=SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relation to Let's Encrypt™) sets up an Nginx webserver and reverse proxy with php support and a built-in certbot client that automates free SSL server certificate generation and renewal processes (Let's Encrypt and ZeroSSL). It also contains fail2ban for intrusion prevention.\" \
               --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}"
+            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 "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+                  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 || :
+               '''
           }
         }
       }
@@ -765,40 +886,26 @@ 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}
+                  [[ ${PUSHIMAGE%%/*} =~ \\. ]] && PUSHIMAGEPLUS="${PUSHIMAGE}" || PUSHIMAGEPLUS="docker.io/${PUSHIMAGE}"
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
+                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
+                  for i in "${CACHE[@]}"; do
-                    if [ -n "${SEMVER}" ]; then
+                      if [[ "${PUSHIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
-                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
+                          CACHEIMAGE=${i}
                       fi
-                    docker push ${PUSHIMAGE}:latest
+                  done
-                    docker push ${PUSHIMAGE}:${META_TAG}
+                  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 push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
                   if [ -n "${SEMVER}" ]; then
-                      docker push ${PUSHIMAGE}:${SEMVER}
+                    docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
                   fi
                 done
               '''
         }
       }
     }
-    }
     // If this is a multi arch release push all images and define the manifest
     stage('Docker-Push-Multi') {
       when {
@@ -806,50 +913,28 @@ 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}
+                  [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}"
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
+                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                  for i in "${CACHE[@]}"; do
-                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                      if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
+                          CACHEIMAGE=${i}
-                    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}
+                  done
-                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                  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 push ${MANIFESTIMAGE}:amd64-latest
+                  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 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 buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
-                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    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}
@@ -859,7 +944,6 @@ pipeline {
         }
       }
     }
-    }
     // If this is a public release tag it in the LS Github
     stage('Github-Tag-Push-Release') {
       when {
@@ -884,7 +968,7 @@ pipeline {
               echo '{"tag_name":"'${META_TAG}'",\
                      "target_commitish": "master",\
                      "name": "'${META_TAG}'",\
-                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**PIP Changes:**\\n\\n' > start
+                     "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**PIP 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'''

README.md

@@ -37,7 +37,6 @@ Find us at:
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/swag)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/swag)
 [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-swag%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-swag/job/master/)
-[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fswag%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/swag/latest/index.html)
 
 SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relation to Let's Encrypt™) sets up an Nginx webserver and reverse proxy with php support and a built-in certbot client that automates free SSL server certificate generation and renewal processes (Let's Encrypt and ZeroSSL). It also contains fail2ban for intrusion prevention.
 
@@ -71,7 +70,7 @@ The architectures supported by this image are:
     1. Certs that only cover your main subdomain (ie. `yoursubdomain.duckdns.org`, leave the `SUBDOMAINS` variable empty)
     2. Certs that cover sub-subdomains of your main subdomain (ie. `*.yoursubdomain.duckdns.org`, set the `SUBDOMAINS` variable to `wildcard`)
 * `--cap-add=NET_ADMIN` is required for fail2ban to modify iptables
-* After setup, navigate to `https://yourdomain.url` to access the default homepage (http access through port 80 is disabled by default, you can enable it by editing the default site config at `/config/nginx/site-confs/default.conf`).
+* After setup, navigate to `https://example.com` to access the default homepage (http access through port 80 is disabled by default, you can enable it by editing the default site config at `/config/nginx/site-confs/default.conf`).
 * Certs are checked nightly and if expiration is within 30 days, renewal is attempted. If your cert is about to expire in less than 30 days, check the logs under `/config/log/letsencrypt` to see why the renewals have been failing. It is recommended to input your e-mail in docker parameters so you receive expiration notices from Let's Encrypt in those circumstances.
 
 ### Certbot Plugins
@@ -154,6 +153,9 @@ Please follow the instructions [on this blog post](https://www.linuxserver.io/bl
 
 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
@@ -168,7 +170,7 @@ services:
       - PUID=1000
       - PGID=1000
       - TZ=Etc/UTC
-      - URL=yourdomain.url
+      - URL=example.com
       - VALIDATION=http
       - SUBDOMAINS=www, #optional
       - CERTPROVIDER= #optional
@@ -195,7 +197,7 @@ docker run -d \
   -e PUID=1000 \
   -e PGID=1000 \
   -e TZ=Etc/UTC \
-  -e URL=yourdomain.url \
+  -e URL=example.com \
   -e VALIDATION=http \
   -e SUBDOMAINS=www, `#optional` \
   -e CERTPROVIDER= `#optional` \
@@ -218,12 +220,12 @@ Containers are configured using parameters passed at runtime (such as those abov
 
 | Parameter | Function |
 | :----: | --- |
-| `-p 443` | Https port |
+| `-p 443:443` | HTTPS port |
-| `-p 80` | Http port (required for http validation and http -> https redirect) |
+| `-p 80` | HTTP port (required for HTTP validation and HTTP -> HTTPS redirect) |
 | `-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). |
-| `-e URL=yourdomain.url` | Top url you have control over (`customdomain.com` if you own it, or `customsubdomain.ddnsprovider.com` if dynamic dns). |
+| `-e URL=example.com` | Top url you have control over (e.g. `example.com` if you own it, or `customsubdomain.example.com` if dynamic dns). |
 | `-e VALIDATION=http` | Certbot validation method to use, options are `http` or `dns` (`dns` method also requires `DNSPLUGIN` variable set). |
 | `-e SUBDOMAINS=www,` | Subdomains you'd like the cert to cover (comma separated, no spaces) ie. `www,ftp,cloud`. For a wildcard cert, set this *exactly* to `wildcard` (wildcard cert is available via `dns` validation only) |
 | `-e CERTPROVIDER=` | Optionally define the cert provider. Set to `zerossl` for ZeroSSL certs (requires existing [ZeroSSL account](https://app.zerossl.com/signup) and the e-mail address entered in `EMAIL` env var). Otherwise defaults to Let's Encrypt. |
@@ -231,9 +233,10 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-e PROPAGATION=` | Optionally override (in seconds) the default propagation time for the dns plugins. |
 | `-e EMAIL=` | Optional e-mail address used for cert expiration notifications (Required for ZeroSSL). |
 | `-e ONLY_SUBDOMAINS=false` | If you wish to get certs only for certain subdomains, but not the main domain (main domain may be hosted on another machine and cannot be validated), set this to `true` |
-| `-e EXTRA_DOMAINS=` | Additional fully qualified domain names (comma separated, no spaces) ie. `extradomain.com,subdomain.anotherdomain.org,*.anotherdomain.org` |
+| `-e EXTRA_DOMAINS=` | Additional fully qualified domain names (comma separated, no spaces) ie. `example.net,subdomain.example.net,*.example.org` |
 | `-e STAGING=false` | Set to `true` to retrieve certs in staging mode. Rate limits will be much higher, but the resulting cert will not pass the browser's security test. Only to be used for testing purposes. |
 | `-v /config` | Persistent config files |
+| `--cap-add=NET_ADMIN` | Required for fail2Ban to be able to modify iptables rules. |
 
 ### Portainer notice
 
@@ -391,10 +394,10 @@ docker build \
   -t lscr.io/linuxserver/swag:latest .
 ```
 
-The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
 
 ```bash
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
+docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
 ```
 
 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.

jenkins-vars.yml

@@ -17,12 +17,12 @@ repo_vars:
   - PR_DOCKERHUB_IMAGE = 'lspipepr/swag'
   - DIST_IMAGE = 'alpine'
   - MULTIARCH='true'
-  - CI='true'
+  - CI='false'
   - CI_WEB='false'
   - CI_PORT='80'
   - CI_SSL='false'
   - CI_DELAY='30'
-  - CI_DOCKERENV='TEST_RUN=1'
+  - CI_DOCKERENV=''
   - CI_AUTH=''
   - CI_WEBPATH=''
 sponsor_links:

package_versions.txt

@@ -1,6 +1,6 @@
 NAME                            VERSION                TYPE                    
 Simple Launcher                 1.1.0.14               dotnet  (+5 duplicates)  
-acme                            2.11.0                 python                   
+acme                            3.0.1                  python                   
 alpine-baselayout               3.6.5-r0               apk                      
 alpine-baselayout-data          3.6.5-r0               apk                      
 alpine-keys                     2.4-r1                 apk                      
@@ -21,8 +21,8 @@ azure-mgmt-dns                  8.2.0                  python
 backports-tarfile               1.2.0                  python                   
 bash                            5.2.26-r0              apk                      
 beautifulsoup4                  4.12.3                 python                   
-boto3                           1.35.54                python                   
+boto3                           1.35.71                python                   
-botocore                        1.35.54                python                   
+botocore                        1.35.71                python                   
 brotli-libs                     1.1.0-r2               apk                      
 bs4                             0.0.2                  python                   
 busybox                         1.36.1-r29             apk                      
@@ -33,46 +33,46 @@ ca-certificates                 20240705-r0            apk
 ca-certificates-bundle          20240705-r0            apk                      
 cachetools                      5.5.0                  python                   
 catatonit                       0.2.0-r0               apk                      
-certbot                         2.11.0                 python                   
+certbot                         3.0.1                  python                   
 certbot-dns-acmedns             0.1.0                  python                   
 certbot-dns-aliyun              2.0.0                  python                   
-certbot-dns-azure               2.5.0                  python                   
+certbot-dns-azure               1.5.0                  python                   
-certbot-dns-bunny               0.0.9                  python                   
+certbot-dns-bunny               3.0.0                  python                   
-certbot-dns-cloudflare          2.11.0                 python                   
+certbot-dns-cloudflare          3.0.1                  python                   
 certbot-dns-cpanel              0.4.0                  python                   
 certbot-dns-desec               1.2.1                  python                   
-certbot-dns-digitalocean        2.11.0                 python                   
+certbot-dns-digitalocean        3.0.1                  python                   
-certbot-dns-directadmin         1.0.4                  python                   
+certbot-dns-directadmin         1.0.12                 python                   
-certbot-dns-dnsimple            2.11.0                 python                   
+certbot-dns-dnsimple            3.0.1                  python                   
-certbot-dns-dnsmadeeasy         2.11.0                 python                   
+certbot-dns-dnsmadeeasy         3.0.1                  python                   
 certbot-dns-dnspod              0.1.0                  python                   
 certbot-dns-do                  0.31.0                 python                   
 certbot-dns-domeneshop          0.2.9                  python                   
 certbot-dns-dreamhost           1.0                    python                   
-certbot-dns-duckdns             1.3                    python                   
+certbot-dns-duckdns             1.5                    python                   
 certbot-dns-dynudns             0.0.6                  python                   
 certbot-dns-freedns             0.2.0                  python                   
-certbot-dns-gehirn              2.11.0                 python                   
+certbot-dns-gehirn              3.0.1                  python                   
 certbot-dns-glesys              2.1.0                  python                   
 certbot-dns-godaddy             2.8.0                  python                   
-certbot-dns-google              2.11.0                 python                   
+certbot-dns-google              3.0.1                  python                   
 certbot-dns-he                  1.0.0                  python                   
 certbot-dns-hetzner             2.0.1                  python                   
 certbot-dns-infomaniak          0.2.2                  python                   
-certbot-dns-inwx                2.2.0                  python                   
+certbot-dns-inwx                3.0.0                  python                   
-certbot-dns-ionos               2024.10.20             python                   
+certbot-dns-ionos               2024.11.9              python                   
-certbot-dns-linode              2.11.0                 python                   
+certbot-dns-linode              3.0.1                  python                   
 certbot-dns-loopia              1.0.1                  python                   
-certbot-dns-luadns              2.11.0                 python                   
+certbot-dns-luadns              3.0.1                  python                   
 certbot-dns-namecheap           1.0.0                  python                   
-certbot-dns-netcup              1.4.3                  python                   
+certbot-dns-netcup              1.4.4                  python                   
-certbot-dns-njalla              1.0.0                  python                   
+certbot-dns-njalla              2.0.2                  python                   
-certbot-dns-nsone               2.11.0                 python                   
+certbot-dns-nsone               3.0.1                  python                   
-certbot-dns-ovh                 2.11.0                 python                   
+certbot-dns-ovh                 3.0.1                  python                   
-certbot-dns-porkbun             0.8                    python                   
+certbot-dns-porkbun             0.9.1                  python                   
-certbot-dns-rfc2136             2.11.0                 python                   
+certbot-dns-rfc2136             3.0.1                  python                   
-certbot-dns-route53             2.11.0                 python                   
+certbot-dns-route53             3.0.1                  python                   
-certbot-dns-sakuracloud         2.11.0                 python                   
+certbot-dns-sakuracloud         3.0.1                  python                   
 certbot-dns-standalone          1.1                    python                   
 certbot-dns-transip             0.5.2                  python                   
 certbot-dns-vultr               1.1.0                  python                   
@@ -81,14 +81,14 @@ certifi                         2024.8.30              python
 cffi                            1.17.1                 python                   
 charset-normalizer              3.4.0                  python                   
 cloudflare                      2.19.4                 python                   
-composer                        2.8.1                  binary                   
+composer                        2.8.3                  binary                   
 configargparse                  1.7                    python                   
 configobj                       5.0.9                  python                   
 coreutils                       9.5-r1                 apk                      
 coreutils-env                   9.5-r1                 apk                      
 coreutils-fmt                   9.5-r1                 apk                      
 coreutils-sha512sum             9.5-r1                 apk                      
-cryptography                    43.0.3                 python                   
+cryptography                    44.0.0                 python                   
 curl                            8.9.1-r2               apk                      
 distro                          1.9.0                  python                   
 dns-lexicon                     3.18.0                 python                   
@@ -115,11 +115,11 @@ gnupg-keyboxd                   2.4.5-r0               apk
 gnupg-utils                     2.4.5-r0               apk                      
 gnupg-wks-client                2.4.5-r0               apk                      
 gnutls                          3.8.5-r0               apk                      
-google-api-core                 2.22.0                 python                   
+google-api-core                 2.23.0                 python                   
-google-api-python-client        2.151.0                python                   
+google-api-python-client        2.154.0                python                   
-google-auth                     2.35.0                 python                   
+google-auth                     2.36.0                 python                   
 google-auth-httplib2            0.2.0                  python                   
-googleapis-common-protos        1.65.0                 python                   
+googleapis-common-protos        1.66.0                 python                   
 gpg                             2.4.5-r0               apk                      
 gpg-agent                       2.4.5-r0               apk                      
 gpg-wks-server                  2.4.5-r0               apk                      
@@ -130,8 +130,8 @@ icu-data-en                     74.2-r0                apk
 icu-libs                        74.2-r0                apk                      
 idna                            3.10                   python                   
 importlib-metadata              8.0.0                  python                   
-importlib-resources             6.4.0                  python                   
 inflect                         7.3.1                  python                   
+inwx-domrobot                   3.2.0                  python                   
 iptables                        1.8.10-r3              apk                      
 iptables-legacy                 1.8.10-r3              apk                      
 isodate                         0.7.2                  python                   
@@ -143,7 +143,7 @@ jmespath                        1.0.1                  python
 josepy                          1.14.0                 python                   
 jq                              1.7.1-r0               apk                      
 jsonlines                       4.0.0                  python                   
-jsonpickle                      3.3.0                  python                   
+jsonpickle                      4.0.0                  python                   
 libacl                          2.3.2-r0               apk                      
 libassuan                       2.5.7-r0               apk                      
 libattr                         2.5.2-r0               apk                      
@@ -155,7 +155,7 @@ libcurl                         8.9.1-r2               apk
 libdav1d                        1.4.2-r0               apk                      
 libedit                         20240517.3.1-r0        apk                      
 libevent                        2.1.12-r7              apk                      
-libexpat                        2.6.3-r0               apk                      
+libexpat                        2.6.4-r0               apk                      
 libffi                          3.4.6-r0               apk                      
 libgcc                          13.2.1_git20240309-r0  apk                      
 libgcrypt                       1.10.3-r0              apk                      
@@ -174,11 +174,11 @@ libmcrypt                       2.5.8-r10              apk
 libmd                           1.1.0-r0               apk                      
 libmemcached-libs               1.1.4-r1               apk                      
 libmnl                          1.0.5-r2               apk                      
-libncursesw                     6.4_p20240420-r1       apk                      
+libncursesw                     6.4_p20240420-r2       apk                      
 libnftnl                        1.2.6-r0               apk                      
-libpanelw                       6.4_p20240420-r1       apk                      
+libpanelw                       6.4_p20240420-r2       apk                      
 libpng                          1.6.44-r0              apk                      
-libpq                           16.4-r0                apk                      
+libpq                           16.6-r0                apk                      
 libproc2                        4.0.4-r0               apk                      
 libpsl                          0.21.5-r1              apk                      
 libsasl                         2.1.28-r6              apk                      
@@ -212,13 +212,13 @@ memcached                       1.6.27-r0              apk
 mock                            5.1.0                  python                   
 more-itertools                  10.3.0                 python                   
 mpdecimal                       4.0.0-r0               apk                      
-msal                            1.31.0                 python                   
+msal                            1.31.1                 python                   
 msal-extensions                 1.2.0                  python                   
 musl                            1.2.5-r0               apk                      
 musl-utils                      1.2.5-r0               apk                      
 my-test-package                 1.0                    python                   
 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                      
 nettle                          3.9.1-r0               apk                      
 nghttp2-libs                    1.62.1-r0              apk                      
@@ -245,82 +245,82 @@ npth                            1.6-r4                 apk
 oniguruma                       6.9.9-r0               apk                      
 openssl                         3.3.2-r1               apk                      
 p11-kit                         0.25.3-r0              apk                      
-packaging                       24.1                   python                   
+packaging                       24.2                   python                   
 parsedatetime                   2.6                    python                   
 pcre                            8.45-r3                apk                      
 pcre2                           10.43-r0               apk                      
 perl                            5.38.2-r0              apk                      
 perl-error                      0.17029-r2             apk                      
 perl-git                        2.45.2-r0              apk                      
-php83                           8.3.13-r0              apk                      
+php83                           8.3.14-r0              apk                      
-php83-bcmath                    8.3.13-r0              apk                      
+php83-bcmath                    8.3.14-r0              apk                      
-php83-bz2                       8.3.13-r0              apk                      
+php83-bz2                       8.3.14-r0              apk                      
-php83-common                    8.3.13-r0              apk                      
+php83-common                    8.3.14-r0              apk                      
-php83-ctype                     8.3.13-r0              apk                      
+php83-ctype                     8.3.14-r0              apk                      
-php83-curl                      8.3.13-r0              apk                      
+php83-curl                      8.3.14-r0              apk                      
-php83-dom                       8.3.13-r0              apk                      
+php83-dom                       8.3.14-r0              apk                      
-php83-exif                      8.3.13-r0              apk                      
+php83-exif                      8.3.14-r0              apk                      
-php83-fileinfo                  8.3.13-r0              apk                      
+php83-fileinfo                  8.3.14-r0              apk                      
-php83-fpm                       8.3.13-r0              apk                      
+php83-fpm                       8.3.14-r0              apk                      
-php83-ftp                       8.3.13-r0              apk                      
+php83-ftp                       8.3.14-r0              apk                      
-php83-gd                        8.3.13-r0              apk                      
+php83-gd                        8.3.14-r0              apk                      
-php83-gmp                       8.3.13-r0              apk                      
+php83-gmp                       8.3.14-r0              apk                      
-php83-iconv                     8.3.13-r0              apk                      
+php83-iconv                     8.3.14-r0              apk                      
-php83-imap                      8.3.13-r0              apk                      
+php83-imap                      8.3.14-r0              apk                      
-php83-intl                      8.3.13-r0              apk                      
+php83-intl                      8.3.14-r0              apk                      
-php83-ldap                      8.3.13-r0              apk                      
+php83-ldap                      8.3.14-r0              apk                      
-php83-mbstring                  8.3.13-r0              apk                      
+php83-mbstring                  8.3.14-r0              apk                      
-php83-mysqli                    8.3.13-r0              apk                      
+php83-mysqli                    8.3.14-r0              apk                      
-php83-mysqlnd                   8.3.13-r0              apk                      
+php83-mysqlnd                   8.3.14-r0              apk                      
-php83-opcache                   8.3.13-r0              apk                      
+php83-opcache                   8.3.14-r0              apk                      
-php83-openssl                   8.3.13-r0              apk                      
+php83-openssl                   8.3.14-r0              apk                      
-php83-pdo                       8.3.13-r0              apk                      
+php83-pdo                       8.3.14-r0              apk                      
-php83-pdo_mysql                 8.3.13-r0              apk                      
+php83-pdo_mysql                 8.3.14-r0              apk                      
-php83-pdo_odbc                  8.3.13-r0              apk                      
+php83-pdo_odbc                  8.3.14-r0              apk                      
-php83-pdo_pgsql                 8.3.13-r0              apk                      
+php83-pdo_pgsql                 8.3.14-r0              apk                      
-php83-pdo_sqlite                8.3.13-r0              apk                      
+php83-pdo_sqlite                8.3.14-r0              apk                      
-php83-pear                      8.3.13-r0              apk                      
+php83-pear                      8.3.14-r0              apk                      
 php83-pecl-apcu                 5.1.23-r0              apk                      
 php83-pecl-igbinary             3.2.15-r0              apk                      
 php83-pecl-mcrypt               1.0.7-r0               apk                      
 php83-pecl-memcached            3.3.0-r0               apk                      
 php83-pecl-msgpack              2.2.0-r2               apk                      
 php83-pecl-redis                6.1.0-r0               apk                      
-php83-pgsql                     8.3.13-r0              apk                      
+php83-pgsql                     8.3.14-r0              apk                      
-php83-phar                      8.3.13-r0              apk                      
+php83-phar                      8.3.14-r0              apk                      
-php83-posix                     8.3.13-r0              apk                      
+php83-posix                     8.3.14-r0              apk                      
-php83-session                   8.3.13-r0              apk                      
+php83-session                   8.3.14-r0              apk                      
-php83-simplexml                 8.3.13-r0              apk                      
+php83-simplexml                 8.3.14-r0              apk                      
-php83-soap                      8.3.13-r0              apk                      
+php83-soap                      8.3.14-r0              apk                      
-php83-sockets                   8.3.13-r0              apk                      
+php83-sockets                   8.3.14-r0              apk                      
-php83-sodium                    8.3.13-r0              apk                      
+php83-sodium                    8.3.14-r0              apk                      
-php83-sqlite3                   8.3.13-r0              apk                      
+php83-sqlite3                   8.3.14-r0              apk                      
-php83-tokenizer                 8.3.13-r0              apk                      
+php83-tokenizer                 8.3.14-r0              apk                      
-php83-xml                       8.3.13-r0              apk                      
+php83-xml                       8.3.14-r0              apk                      
-php83-xmlreader                 8.3.13-r0              apk                      
+php83-xmlreader                 8.3.14-r0              apk                      
-php83-xmlwriter                 8.3.13-r0              apk                      
+php83-xmlwriter                 8.3.14-r0              apk                      
-php83-xsl                       8.3.13-r0              apk                      
+php83-xsl                       8.3.14-r0              apk                      
-php83-zip                       8.3.13-r0              apk                      
+php83-zip                       8.3.14-r0              apk                      
 pinentry                        1.3.0-r0               apk                      
 pip                             24.3.1                 python                   
-pkb-client                      1.2                    python                   
+pkb-client                      2.0.0                  python                   
 platformdirs                    4.2.2                  python                   
 popt                            1.19-r3                apk                      
 portalocker                     2.10.1                 python                   
 procps-ng                       4.0.4-r0               apk                      
 proto-plus                      1.25.0                 python                   
-protobuf                        5.28.3                 python                   
+protobuf                        5.29.0                 python                   
 pyacmedns                       0.4                    python                   
 pyasn1                          0.6.1                  python                   
 pyasn1-modules                  0.4.1                  python                   
 pyc                             3.12.7-r0              apk                      
 pycparser                       2.22                   python                   
-pyjwt                           2.9.0                  python                   
+pyjwt                           2.10.1                 python                   
 pynamecheap                     0.0.3                  python                   
-pyopenssl                       24.2.1                 python                   
+pyopenssl                       24.3.0                 python                   
 pyotp                           2.9.0                  python                   
 pyparsing                       3.2.0                  python                   
-pyrfc3339                       1.1                    python                   
+pyrfc3339                       2.0.1                  python                   
 python-dateutil                 2.9.0.post0            python                   
 python-digitalocean             1.17.0                 python                   
 python-transip                  0.6.0                  python                   
@@ -334,9 +334,9 @@ requests                        2.32.3                 python
 requests-file                   2.1.0                  python                   
 requests-mock                   1.12.1                 python                   
 rsa                             4.9                    python                   
-s3transfer                      0.10.3                 python                   
+s3transfer                      0.10.4                 python                   
 scanelf                         1.3.7-r2               apk                      
-setuptools                      75.3.0                 python                   
+setuptools                      75.6.0                 python                   
 shadow                          4.15.1-r0              apk                      
 six                             1.16.0                 python                   
 skalibs                         2.14.1.1-r0            apk                      
@@ -344,7 +344,7 @@ soupsieve                       2.6                    python
 sqlite-libs                     3.45.3-r1              apk                      
 ssl_client                      1.36.1-r29             apk                      
 tiff                            4.6.0t-r0              apk                      
-tldextract                      5.1.2                  python                   
+tldextract                      5.1.3                  python                   
 tomli                           2.0.1                  python                   
 typeguard                       4.3.0                  python                   
 typing-extensions               4.12.2                 python  (+1 duplicate)   
@@ -354,10 +354,10 @@ uritemplate                     4.1.1                  python
 urllib3                         2.2.3                  python                   
 utmps-libs                      0.1.2.2-r1             apk                      
 wheel                           0.43.0                 python                   
-wheel                           0.44.0                 python                   
+wheel                           0.45.1                 python                   
 whois                           5.5.23-r0              apk                      
 xz-libs                         5.6.2-r0               apk                      
 zipp                            3.19.2                 python                   
 zlib                            1.3.1-r1               apk                      
-zope-interface                  7.1.1                  python                   
+zope-interface                  7.2                    python                   
 zstd-libs                       1.5.6-r0               apk                      

readme-vars.yml

@@ -6,29 +6,26 @@ project_url: "https://linuxserver.io"
 project_logo: "https://github.com/linuxserver/docker-templates/raw/master/linuxserver.io/img/swag.gif"
 project_blurb: "SWAG - Secure Web Application Gateway (formerly known as letsencrypt, no relation to Let's Encrypt™) sets up an Nginx webserver and reverse proxy with php support and a built-in certbot client that automates free SSL server certificate generation and renewal processes (Let's Encrypt and ZeroSSL). It also contains fail2ban for intrusion prevention."
 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"}
-
 # container parameters
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
 param_usage_include_env: true
 param_env_vars:
-  - { env_var: "URL", env_value: "yourdomain.url", desc: "Top url you have control over (`customdomain.com` if you own it, or `customsubdomain.ddnsprovider.com` if dynamic dns)." }
+  - {env_var: "URL", env_value: "example.com", desc: "Top url you have control over (e.g. `example.com` if you own it, or `customsubdomain.example.com` if dynamic dns)."}
   - {env_var: "VALIDATION", env_value: "http", desc: "Certbot validation method to use, options are `http` or `dns` (`dns` method also requires `DNSPLUGIN` variable set).", env_options: ["http", "dns"]}
 param_usage_include_vols: true
 param_volumes:
   - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files"}
 param_usage_include_ports: true
 param_ports:
-  - { external_port: "443", internal_port: "443", port_desc: "Https port" }
+  - {external_port: "443", internal_port: "443", port_desc: "HTTPS port"}
 cap_add_param: true
 cap_add_param_vars:
-  - { cap_add_var: "NET_ADMIN" }
+  - {cap_add_var: "NET_ADMIN", desc: "Required for fail2Ban to be able to modify iptables rules."}
-
 # optional container parameters
 opt_param_usage_include_env: true
 opt_param_env_vars:
@@ -38,12 +35,11 @@ opt_param_env_vars:
   - {env_var: "PROPAGATION", env_value: "", desc: "Optionally override (in seconds) the default propagation time for the dns plugins."}
   - {env_var: "EMAIL", env_value: "", desc: "Optional e-mail address used for cert expiration notifications (Required for ZeroSSL)."}
   - {env_var: "ONLY_SUBDOMAINS", env_value: "false", desc: "If you wish to get certs only for certain subdomains, but not the main domain (main domain may be hosted on another machine and cannot be validated), set this to `true`"}
-  - { env_var: "EXTRA_DOMAINS", env_value: "", desc: "Additional fully qualified domain names (comma separated, no spaces) ie. `extradomain.com,subdomain.anotherdomain.org,*.anotherdomain.org`" }
+  - {env_var: "EXTRA_DOMAINS", env_value: "", desc: "Additional fully qualified domain names (comma separated, no spaces) ie. `example.net,subdomain.example.net,*.example.org`"}
   - {env_var: "STAGING", env_value: "false", desc: "Set to `true` to retrieve certs in staging mode. Rate limits will be much higher, but the resulting cert will not pass the browser's security test. Only to be used for testing purposes."}
 opt_param_usage_include_ports: true
 opt_param_ports:
-  - { external_port: "80", internal_port: "80", port_desc: "Http port (required for http validation and http -> https redirect)" }
+  - {external_port: "80", internal_port: "80", port_desc: "HTTP port (required for HTTP validation and HTTP -> HTTPS redirect)"}
-
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -59,7 +55,7 @@ app_setup_block: |
       1. Certs that only cover your main subdomain (ie. `yoursubdomain.duckdns.org`, leave the `SUBDOMAINS` variable empty)
       2. Certs that cover sub-subdomains of your main subdomain (ie. `*.yoursubdomain.duckdns.org`, set the `SUBDOMAINS` variable to `wildcard`)
   * `--cap-add=NET_ADMIN` is required for fail2ban to modify iptables
-  * After setup, navigate to `https://yourdomain.url` to access the default homepage (http access through port 80 is disabled by default, you can enable it by editing the default site config at `/config/nginx/site-confs/default.conf`).
+  * After setup, navigate to `https://example.com` to access the default homepage (http access through port 80 is disabled by default, you can enable it by editing the default site config at `/config/nginx/site-confs/default.conf`).
   * Certs are checked nightly and if expiration is within 30 days, renewal is attempted. If your cert is about to expire in less than 30 days, check the logs under `/config/log/letsencrypt` to see why the renewals have been failing. It is recommended to input your e-mail in docker parameters so you receive expiration notices from Let's Encrypt in those circumstances.
 
   ### Certbot Plugins
@@ -137,7 +133,71 @@ app_setup_block: |
   ### Migration from the old `linuxserver/letsencrypt` image
 
   Please follow the instructions [on this blog post](https://www.linuxserver.io/blog/2020-08-21-introducing-swag#migrate).
-
+# init diagram
+init_diagram: |
+  "swag: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-swag-config -> init-certbot-config
+    init-nginx-end -> init-config
+    init-os-end -> init-config
+    init-config -> init-config-end
+    init-outdated-config -> init-config-end
+    init-os-end -> init-crontab-config
+    init-mods-end -> init-custom-files
+    base -> init-envfile
+    init-swag-samples -> init-fail2ban-config
+    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-renew -> init-outdated-config
+    init-keygen -> init-permissions
+    init-certbot-config -> init-permissions-config
+    init-nginx -> init-php
+    init-permissions-config -> init-renew
+    init-config -> init-require-url
+    init-folders -> init-samples
+    init-custom-files -> init-services
+    init-mods-end -> init-services
+    init-fail2ban-config -> init-swag-config
+    init-require-url -> init-swag-folders
+    init-swag-folders -> init-swag-samples
+    init-config-end -> init-version-checks
+    init-services -> svc-cron
+    svc-cron -> legacy-services
+    init-services -> svc-fail2ban
+    svc-fail2ban -> 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"
+  }
+  "swag:latest" <- Base Images
 # changelog
 changelogs:
   - {date: "21.10.24:", desc: "Fix naming issue with Dynu plugin. If you are using Dynu, please make sure your credentials are set in /config/dns-conf/dynu.ini and your DNSPLUGIN variable is set to dynu (not dynudns)."}

root/etc/s6-overlay/s6-rc.d/init-folders-config/up

@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-folders-config/run

root/etc/s6-overlay/s6-rc.d/init-nginx-config/up

@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-nginx-config/run

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

@@ -6,4 +6,6 @@ lsiown -R abc:abc \
     /config
 chmod -R 0644 /etc/logrotate.d
 chmod -R +r /config/log
-chmod +x /app/le-renew.sh
+
+# Workaround for systems with chmod errors
+true

root/etc/s6-overlay/s6-rc.d/init-samples-config/up

@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-samples-config/run

root/etc/s6-overlay/s6-rc.d/init-swag-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-swag-config/run

root/etc/s6-overlay/s6-rc.d/init-swag-folders/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-swag-folders/run

root/etc/s6-overlay/s6-rc.d/init-swag-samples/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-swag-samples/run

root/etc/s6-overlay/s6-rc.d/init-test-run/run

@@ -1,7 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-# Echo init finish for test runs
-if [[ -n "${TEST_RUN}" ]]; then
-    echo '[services.d] done.'
-fi

root/etc/s6-overlay/s6-rc.d/init-test-run/type

@@ -1 +0,0 @@
-oneshot

root/etc/s6-overlay/s6-rc.d/init-test-run/up

@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-test-run/run