Bot Updating Package Versions

Merge pull request #497 from linuxserver/readme-typo
fix typo
2026-03-03 00:43:34 +09:00 · 2024-08-10 03:27:12 +00:00 · 2024-08-07 08:30:01 -04:00 · 2024-08-07 12:08:32 +00:00 · 2024-08-07 08:06:25 -04:00 · 2024-08-07 12:04:22 +00:00
26 changed files with 669 additions and 600 deletions
--- a/.github/ISSUE_TEMPLATE/issue.bug.yml
+++ b/.github/ISSUE_TEMPLATE/issue.bug.yml
@@ -67,10 +67,10 @@ body:
  - type: textarea
    attributes:
      description: |
-        Provide a full docker log, output of "docker logs linuxserver.io"
+        Provide a full docker log, output of "docker logs swag"
      label: Container logs
      placeholder: |
-        Output of `docker logs linuxserver.io`
+        Output of `docker logs swag`
      render: bash
    validations:
      required: true
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -7,7 +7,7 @@ jobs:
  external-trigger-master:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1

      - name: External Trigger
        if: github.ref == 'refs/heads/master'
--- a/.github/workflows/external_trigger_scheduler.yml
+++ b/.github/workflows/external_trigger_scheduler.yml
@@ -9,7 +9,7 @@ jobs:
  external-trigger-scheduler:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
        with:
          fetch-depth: '0'

--- a/.github/workflows/package_trigger.yml
+++ b/.github/workflows/package_trigger.yml
@@ -7,7 +7,7 @@ jobs:
  package-trigger-master:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1

      - name: Package Trigger
        if: github.ref == 'refs/heads/master'
--- a/.github/workflows/package_trigger_scheduler.yml
+++ b/.github/workflows/package_trigger_scheduler.yml
@@ -9,7 +9,7 @@ jobs:
  package-trigger-scheduler:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
        with:
          fetch-depth: '0'

--- a/.github/workflows/permissions.yml
+++ b/.github/workflows/permissions.yml
@@ -5,6 +5,8 @@ on:
      - '**/run'
      - '**/finish'
      - '**/check'
+      - 'root/migrations/*'
+
 jobs:
  permission_check:
    uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1
--- a/74
+++ b/74
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20

 # set version label
 ARG BUILD_DATE
@@ -27,6 +27,7 @@ RUN \
  apk add --no-cache \
    fail2ban \
    gnupg \
+    iptables-legacy \
    memcached \
    nginx-mod-http-brotli \
    nginx-mod-http-dav-ext \
@@ -45,39 +46,38 @@ RUN \
    nginx-mod-stream \
    nginx-mod-stream-geoip2 \
    nginx-vim \
-    php82-bcmath \
-    php82-bz2 \
-    php82-dom \
-    php82-exif \
-    php82-ftp \
-    php82-gd \
-    php82-gmp \
-    php82-imap \
-    php82-intl \
-    php82-ldap \
-    php82-mysqli \
-    php82-mysqlnd \
-    php82-opcache \
-    php82-pdo_mysql \
-    php82-pdo_odbc \
-    php82-pdo_pgsql \
-    php82-pdo_sqlite \
-    php82-pear \
-    php82-pecl-apcu \
-    php82-pecl-memcached \
-    php82-pecl-redis \
-    php82-pgsql \
-    php82-posix \
-    php82-soap \
-    php82-sockets \
-    php82-sodium \
-    php82-sqlite3 \
-    php82-tokenizer \
-    php82-xmlreader \
-    php82-xsl \
+    php83-bcmath \
+    php83-bz2 \
+    php83-dom \
+    php83-exif \
+    php83-ftp \
+    php83-gd \
+    php83-gmp \
+    php83-imap \
+    php83-intl \
+    php83-ldap \
+    php83-mysqli \
+    php83-mysqlnd \
+    php83-opcache \
+    php83-pdo_mysql \
+    php83-pdo_odbc \
+    php83-pdo_pgsql \
+    php83-pdo_sqlite \
+    php83-pear \
+    php83-pecl-apcu \
+    php83-pecl-mcrypt \
+    php83-pecl-memcached \
+    php83-pecl-redis \
+    php83-pgsql \
+    php83-posix \
+    php83-soap \
+    php83-sockets \
+    php83-sodium \
+    php83-sqlite3 \
+    php83-tokenizer \
+    php83-xmlreader \
+    php83-xsl \
    whois && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
-    php82-pecl-mcrypt && \
  echo "**** install certbot plugins ****" && \
  if [ -z ${CERTBOT_VERSION+x} ]; then \
    CERTBOT_VERSION=$(curl -sL  https://pypi.python.org/pypi/certbot/json |jq -r '. | .info.version'); \
@@ -86,7 +86,7 @@ RUN \
  pip install -U --no-cache-dir \
    pip \
    wheel && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
    certbot==${CERTBOT_VERSION} \
    certbot-dns-acmedns \
    certbot-dns-aliyun \
@@ -104,11 +104,12 @@ RUN \
    certbot-dns-domeneshop \
    certbot-dns-dreamhost \
    certbot-dns-duckdns \
+    certbot-dns-dynudns \
    certbot-dns-freedns \
    certbot-dns-gehirn \
+    certbot-dns-glesys \
    certbot-dns-godaddy \
    certbot-dns-google \
-    certbot-dns-google-domains \
    certbot-dns-he \
    certbot-dns-hetzner \
    certbot-dns-infomaniak \
@@ -143,6 +144,8 @@ RUN \
  sed -i \
    's|#ssl_trusted_certificate /config/keys/cert.crt;|ssl_trusted_certificate /config/keys/cert.crt;|' \
    /defaults/nginx/ssl.conf.sample && \
+  echo "**** remove stream.conf ****" && \
+  rm -f /etc/nginx/conf.d/stream.conf && \
  echo "**** correct ip6tables legacy issue ****" && \
  rm \
    /sbin/ip6tables && \
@@ -166,6 +169,7 @@ RUN \
  tar xf \
    /tmp/proxy-confs.tar.gz -C \
    /defaults/nginx/proxy-confs --strip-components=1 --exclude=linux*/.editorconfig --exclude=linux*/.gitattributes --exclude=linux*/.github --exclude=linux*/.gitignore --exclude=linux*/LICENSE && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
  echo "**** cleanup ****" && \
  apk del --purge \
    build-dependencies && \
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20

 # set version label
 ARG BUILD_DATE
@@ -27,6 +27,7 @@ RUN \
  apk add --no-cache \
    fail2ban \
    gnupg \
+    iptables-legacy \
    memcached \
    nginx-mod-http-brotli \
    nginx-mod-http-dav-ext \
@@ -45,39 +46,38 @@ RUN \
    nginx-mod-stream \
    nginx-mod-stream-geoip2 \
    nginx-vim \
-    php82-bcmath \
-    php82-bz2 \
-    php82-dom \
-    php82-exif \
-    php82-ftp \
-    php82-gd \
-    php82-gmp \
-    php82-imap \
-    php82-intl \
-    php82-ldap \
-    php82-mysqli \
-    php82-mysqlnd \
-    php82-opcache \
-    php82-pdo_mysql \
-    php82-pdo_odbc \
-    php82-pdo_pgsql \
-    php82-pdo_sqlite \
-    php82-pear \
-    php82-pecl-apcu \
-    php82-pecl-memcached \
-    php82-pecl-redis \
-    php82-pgsql \
-    php82-posix \
-    php82-soap \
-    php82-sockets \
-    php82-sodium \
-    php82-sqlite3 \
-    php82-tokenizer \
-    php82-xmlreader \
-    php82-xsl \
+    php83-bcmath \
+    php83-bz2 \
+    php83-dom \
+    php83-exif \
+    php83-ftp \
+    php83-gd \
+    php83-gmp \
+    php83-imap \
+    php83-intl \
+    php83-ldap \
+    php83-mysqli \
+    php83-mysqlnd \
+    php83-opcache \
+    php83-pdo_mysql \
+    php83-pdo_odbc \
+    php83-pdo_pgsql \
+    php83-pdo_sqlite \
+    php83-pear \
+    php83-pecl-apcu \
+    php83-pecl-mcrypt \
+    php83-pecl-memcached \
+    php83-pecl-redis \
+    php83-pgsql \
+    php83-posix \
+    php83-soap \
+    php83-sockets \
+    php83-sodium \
+    php83-sqlite3 \
+    php83-tokenizer \
+    php83-xmlreader \
+    php83-xsl \
    whois && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
-    php82-pecl-mcrypt && \
  echo "**** install certbot plugins ****" && \
  if [ -z ${CERTBOT_VERSION+x} ]; then \
    CERTBOT_VERSION=$(curl -sL  https://pypi.python.org/pypi/certbot/json |jq -r '. | .info.version'); \
@@ -86,7 +86,7 @@ RUN \
  pip install -U --no-cache-dir \
    pip \
    wheel && \
-  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.18/ \
+  pip install -U --no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine-3.20/ \
    certbot==${CERTBOT_VERSION} \
    certbot-dns-acmedns \
    certbot-dns-aliyun \
@@ -104,11 +104,12 @@ RUN \
    certbot-dns-domeneshop \
    certbot-dns-dreamhost \
    certbot-dns-duckdns \
+    certbot-dns-dynudns \
    certbot-dns-freedns \
    certbot-dns-gehirn \
+    certbot-dns-glesys \
    certbot-dns-godaddy \
    certbot-dns-google \
-    certbot-dns-google-domains \
    certbot-dns-he \
    certbot-dns-hetzner \
    certbot-dns-infomaniak \
@@ -143,6 +144,8 @@ RUN \
  sed -i \
    's|#ssl_trusted_certificate /config/keys/cert.crt;|ssl_trusted_certificate /config/keys/cert.crt;|' \
    /defaults/nginx/ssl.conf.sample && \
+  echo "**** remove stream.conf ****" && \
+  rm -f /etc/nginx/conf.d/stream.conf && \
  echo "**** correct ip6tables legacy issue ****" && \
  rm \
    /sbin/ip6tables && \
@@ -166,6 +169,7 @@ RUN \
  tar xf \
    /tmp/proxy-confs.tar.gz -C \
    /defaults/nginx/proxy-confs --strip-components=1 --exclude=linux*/.editorconfig --exclude=linux*/.gitattributes --exclude=linux*/.github --exclude=linux*/.gitignore --exclude=linux*/LICENSE && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
  echo "**** cleanup ****" && \
  apk del --purge \
    build-dependencies && \
--- a/232
+++ b/232
@@ -16,6 +16,7 @@ pipeline {
    GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
    GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
    GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
+    DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
    EXT_PIP = 'certbot'
    BUILD_VERSION_ARG = 'CERTBOT_VERSION'
    LS_USER = 'linuxserver'
@@ -59,11 +60,16 @@ pipeline {
          env.COMMIT_SHA = sh(
            script: '''git rev-parse HEAD''',
            returnStdout: true).trim()
+          env.GH_DEFAULT_BRANCH = sh(
+            script: '''git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||' ''',
+            returnStdout: true).trim()
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
          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 ./.github/workflows/package_trigger.yml ./root/donate.txt'
        }
+        sh '''#! /bin/bash
+              echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
        script{
          env.LS_RELEASE_NUMBER = sh(
            script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''',
@@ -120,7 +126,7 @@ pipeline {
      steps{
        script{
          env.EXT_RELEASE_CLEAN = sh(
-            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
+            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/ ]//g' ''',
            returnStdout: true).trim()

          def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
@@ -138,7 +144,7 @@ pipeline {
          }

          if (env.SEMVER != null) {
-            if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
+            if (BRANCH_NAME != "${env.GH_DEFAULT_BRANCH}") {
              env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
            }
            println("SEMVER: ${env.SEMVER}")
@@ -239,9 +245,11 @@ pipeline {
                  -v ${WORKSPACE}:/mnt \
                  -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
                  -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
-                    apk add --no-cache py3-pip && \
-                    pip install s3cmd && \
+                  ghcr.io/linuxserver/baseimage-alpine:3.20 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 && \
+                    pip install --no-cache-dir s3cmd && \
                    s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
        }
      }
@@ -260,8 +268,15 @@ pipeline {
              set -e
              TEMPDIR=$(mktemp -d)
              docker pull ghcr.io/linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
-              # Stage 1 - Jenkinsfile update
+              # Cloned repo paths for templating:
+              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch master of ${LS_USER}/${LS_REPO} for running the jenkins builder on
+              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch master of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
+              # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github
+              # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos
+              # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github
+              git clone --branch master --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
+              docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest 
+              echo "Starting Stage 1 - Jenkinsfile update"
              if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
@@ -270,16 +285,17 @@ pipeline {
                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                git add Jenkinsfile
                git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                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 Jenkinsfile"
+                echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
                exit 0
              else
                echo "Jenkinsfile is up to date."
              fi
-              # Stage 2 - Delete old templates
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
+              echo "Starting Stage 2 - Delete old templates"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
              for i in ${OLD_TEMPLATES}; do
                if [[ -f "${i}" ]]; then
                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -294,15 +310,16 @@ pipeline {
                  git rm "${i}"
                done
                git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                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 "Deleting old and deprecated templates"
+                echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit"
                rm -Rf ${TEMPDIR}
                exit 0
              else
                echo "No templates to delete"
              fi
-              # Stage 3 - Update templates
+              echo "Starting Stage 3 - Update templates"
              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
@@ -323,31 +340,50 @@ pipeline {
                fi
                git add readme-vars.yml ${TEMPLATED_FILES}
                git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                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 "No templates to update"
              fi
+              echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub"
              mkdir -p ${TEMPDIR}/docs
-              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
+              git clone --depth=1 https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}"  ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
                cd ${TEMPDIR}/docs/docker-documentation
+                GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
                git add docs/images/docker-${CONTAINER_NAME}.md
+                echo "Updating docs repo"
                git commit -m 'Bot Updating Documentation'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to docs failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH})
+              else
+                echo "Docs update not needed, skipping"
              fi
              mkdir -p ${TEMPDIR}/unraid
-              git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
-              git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
+              git clone --depth=1 https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
+              git clone --depth=1 https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
              if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
              elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
              fi
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+                echo "Updating Unraid template"
                cd ${TEMPDIR}/unraid/templates/
-                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
+                GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
+                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then
+                  echo "Image is on the ignore list, and already in the deprecation folder."
+                elif grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
                  echo "Image is on the ignore list, marking Unraid template as deprecated"
                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                  git add -u unraid/${CONTAINER_NAME}.xml
@@ -358,7 +394,42 @@ pipeline {
                  git add unraid/${CONTAINER_NAME}.xml
                  git commit -m 'Bot Updating Unraid Template'
                fi
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to unraid templates failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH})
+              else
+                echo "No updates to Unraid template needed, skipping"
+              fi
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then
+                if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) -gt 25000 ]]; then
+                  echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub"
+                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite"
+                else
+                  echo "Syncing readme to Docker Hub"
+                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md"
+                fi
+                if curl -s https://hub.docker.com/v2/namespaces/${DOCKERHUB_IMAGE%%/*}/repositories/${DOCKERHUB_IMAGE##*/}/tags | jq -r '.message' | grep -q 404; then
+                  echo "Docker Hub endpoint doesn't exist. Creating endpoint first."
+                  DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                  curl -s \
+                    -H "Authorization: JWT ${DH_TOKEN}" \
+                    -H "Content-Type: application/json" \
+                    -X POST \
+                    -d '{"name":"'${DOCKERHUB_IMAGE##*/}'", "namespace":"'${DOCKERHUB_IMAGE%%/*}'"}' \
+                    https://hub.docker.com/v2/repositories/ || :
+                fi
+                DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                curl -s \
+                  -H "Authorization: JWT ${DH_TOKEN}" \
+                  -H "Content-Type: application/json" \
+                  -X PATCH \
+                  -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \
+                  https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || :
+              else
+                echo "Not the default Github branch. Skipping readme sync to Docker Hub."
              fi
              rm -Rf ${TEMPDIR}'''
        script{
@@ -414,14 +485,16 @@ pipeline {
      }
      steps{
        sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \
-        -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
-             "name":"'${LS_REPO}'",
-             "mirror":true,\
-             "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
-             "issues_access_level":"disabled",\
-             "merge_requests_access_level":"disabled",\
-             "repository_access_level":"enabled",\
-             "visibility":"public"}' '''
+          -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
+            "name":"'${LS_REPO}'",
+            "mirror":true,\
+            "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
+            "issues_access_level":"disabled",\
+            "merge_requests_access_level":"disabled",\
+            "repository_access_level":"enabled",\
+            "visibility":"public"}' '''
+        sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \
+          -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" '''
      } 
    }
    /* ###############
@@ -452,6 +525,7 @@ 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 \
          --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
      }
    }
@@ -483,6 +557,7 @@ 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 \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
          }
        }
@@ -511,6 +586,7 @@ 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 \
              --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(5) {
@@ -537,7 +613,7 @@ pipeline {
        sh '''#! /bin/bash
              set -e
              TEMPDIR=$(mktemp -d)
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
+              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" != "true" ]; then
                LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
              else
                LOCAL_CONTAINER=${IMAGE}:${META_TAG}
@@ -558,7 +634,8 @@ pipeline {
                wait
                git add package_versions.txt
                git commit -m 'Bot Updating Package Versions'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                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/packages-${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Package tag updated, stopping build process"
              else
@@ -626,14 +703,14 @@ pipeline {
                set -e
                docker pull ghcr.io/linuxserver/ci:latest
                if [ "${MULTIARCH}" == "true" ]; then
-                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  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
                docker run --rm \
                --shm-size=1gb \
                -v /var/run/docker.sock:/var/run/docker.sock \
                -e IMAGE=\"${IMAGE}\" \
-                -e DELAY_START=\"${CI_DELAY}\" \
+                -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                -e TAGS=\"${CI_TAGS}\" \
                -e META_TAG=\"${META_TAG}\" \
                -e PORT=\"${CI_PORT}\" \
@@ -661,12 +738,6 @@ pipeline {
      }
      steps {
        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
          [
            $class: 'UsernamePasswordMultiBinding',
            credentialsId: 'Quay.io-Robot',
@@ -677,7 +748,7 @@ pipeline {
          retry(5) {
            sh '''#! /bin/bash
                  set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  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
@@ -708,12 +779,6 @@ pipeline {
      }
      steps {
        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
          [
            $class: 'UsernamePasswordMultiBinding',
            credentialsId: 'Quay.io-Robot',
@@ -724,12 +789,12 @@ pipeline {
          retry(5) {
            sh '''#! /bin/bash
                  set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  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}
+                    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
@@ -753,35 +818,13 @@ pipeline {
                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest || :
-                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
-                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
+                  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 manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
-                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
-                    fi
-                    token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
-                    digest=$(curl -s \
-                      --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-                      --header "Authorization: Bearer ${token}" \
-                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
-                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
-                      docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
-                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
-                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:latest
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
-                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
-                    if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
+                      docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                    fi
                  done
               '''
@@ -854,39 +897,6 @@ EOF
          ) '''
      }
    }
-    // Use helper container to sync the current README on master to the dockerhub endpoint
-    stage('Sync-README') {
-      when {
-        environment name: 'CHANGE_ID', value: ''
-        environment name: 'EXIT_STATUS', value: ''
-      }
-      steps {
-        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ]
-        ]) {
-          sh '''#! /bin/bash
-                set -e
-                TEMPDIR=$(mktemp -d)
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
-                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
-                docker pull ghcr.io/linuxserver/readme-sync
-                docker run --rm=true \
-                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
-                  -e DOCKERHUB_PASSWORD=$DOCKERPASS \
-                  -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
-                  -e DOCKER_REPOSITORY=${IMAGE} \
-                  -e GIT_BRANCH=master \
-                  -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
-                  ghcr.io/linuxserver/readme-sync bash -c 'node sync'
-                rm -Rf ${TEMPDIR} '''
-        }
-      }
-    }
    // If this is a Pull request send the CI link as a comment on it
    stage('Pull Request Comment') {
      when {
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Find us at:

 # [linuxserver/swag](https://github.com/linuxserver/docker-swag)

-[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fswag?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fswag)
+[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fswag?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh)
 [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-swag)
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-swag.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-swag/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-swag/packages)
@@ -76,7 +76,7 @@ The architectures supported by this image are:

 ### Certbot Plugins

-SWAG includes many Certbot plugins out of the box, but not all plugins can be includes.
+SWAG includes many Certbot plugins out of the box, but not all plugins can be included.
 If you need a plugin that is not included, the quickest way to have the plugin available is to use our [Universal Package Install Docker Mod](https://github.com/linuxserver/docker-mods/tree/universal-package-install).

 Set the following environment variables on your container:
@@ -158,7 +158,6 @@ To help you get started creating a container from this image you can either use

 ```yaml
 ---
-version: "2.1"
 services:
  swag:
    image: lscr.io/linuxserver/swag:latest
@@ -180,7 +179,7 @@ services:
      - EXTRA_DOMAINS= #optional
      - STAGING=false #optional
    volumes:
-      - /path/to/appdata/config:/config
+      - /path/to/swag/config:/config
    ports:
      - 443:443
      - 80:80 #optional
@@ -208,7 +207,7 @@ docker run -d \
  -e STAGING=false `#optional` \
  -p 443:443 \
  -p 80:80 `#optional` \
-  -v /path/to/appdata/config:/config \
+  -v /path/to/swag/config:/config \
  --restart unless-stopped \
  lscr.io/linuxserver/swag:latest
 ```
@@ -228,13 +227,13 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-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. |
-| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `freedns`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip`, and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`. |
+| `-e DNSPLUGIN=cloudflare` | Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `dynudns`, `freedns`, `gandi`, `gehirn`, `glesys`, `godaddy`, `google`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip`, and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`. |
 | `-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 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` | All the config files including the webroot reside here. |
+| `-v /config` | Persistent config files |

 ### Portainer notice

@@ -309,7 +308,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to

 ## Updating Info

-Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
+Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.

 Below are the instructions for updating containers:

@@ -374,21 +373,6 @@ Below are the instructions for updating containers:
    docker image prune
    ```

-### Via Watchtower auto-updater (only use if you don't remember the original parameters)
-
-* Pull the latest image at its tag and replace it with the same env variables in one run:
-
-    ```bash
-    docker run --rm \
-      -v /var/run/docker.sock:/var/run/docker.sock \
-      containrrr/watchtower \
-      --run-once swag
-    ```
-
-* You can also remove the old dangling images: `docker image prune`
-
-**warning**: We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
-
 ### Image Update Notifications - Diun (Docker Image Update Notifier)

 **tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
@@ -416,6 +400,15 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **24.07.14:** - Rebase to Alpine 3.20. Remove deprecated Google Domains certbot plugin. Existing users should update their nginx confs to avoid http2 deprecation warnings.
+* **01.07.24:** - Fall back to iptables-legacy if iptables doesn't work.
+* **23.03.24:** - Fix perms on the generated `priv-fullchain-bundle.pem`.
+* **14.03.24:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-location.conf, authelia-server.conf - Update Authelia conf samples with support for 4.38.
+* **11.03.24:** - Restore support for DynuDNS using `certbot-dns-dynudns`.
+* **06.03.24:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Cleanup default site conf.
+* **04.03.24:** - Remove `stream.conf` inside the container to allow users to include their own block in `nginx.conf`.
+* **23.01.24:** - Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate.
+* **01.01.24:** - Add GleSYS DNS plugin.
 * **11.12.23:** - Deprecate certbot-dns-dynu to resolve dependency conflicts with other plugins.
 * **30.11.23:** - [Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404.
 * **23.11.23:** - Run certbot as root to allow fix http validation.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -6,7 +6,6 @@ external_type: pip_version
 release_type: stable
 release_tag: latest
 ls_branch: master
-build_armhf: false
 repo_vars:
  - EXT_PIP = 'certbot'
  - BUILD_VERSION_ARG = 'CERTBOT_VERSION'
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,340 +1,363 @@
-NAME                            VERSION                 TYPE   
-ConfigArgParse                  1.7                     python  
-PyJWT                           2.8.0                   python  
-PyNamecheap                     0.0.3                   python  
-PyYAML                          6.0.1                   python  
-SimpleLauncherExecutable        1.1.0.14                dotnet  
-acme                            2.8.0                   python  
-alpine-baselayout               3.4.3-r1                apk     
-alpine-baselayout-data          3.4.3-r1                apk     
-alpine-keys                     2.4-r1                  apk     
-alpine-release                  3.18.5-r0               apk     
-anyio                           4.1.0                   python  
-aom-libs                        3.6.1-r0                apk     
-apache2-utils                   2.4.58-r0               apk     
-apk-tools                       2.14.0-r2               apk     
-apr                             1.7.4-r0                apk     
-apr-util                        1.6.3-r1                apk     
-argon2-libs                     20190702-r4             apk     
-attrs                           23.1.0                  python  
-azure-common                    1.1.28                  python  
-azure-core                      1.29.6                  python  
-azure-identity                  1.15.0                  python  
-azure-mgmt-core                 1.4.0                   python  
-azure-mgmt-dns                  8.1.0                   python  
-bash                            5.2.15-r5               apk     
-beautifulsoup4                  4.12.2                  python  
-boto3                           1.34.2                  python  
-botocore                        1.34.2                  python  
-brotli-libs                     1.0.9-r14               apk     
-bs4                             0.0.1                   python  
-busybox                         1.36.1-r5               apk     
-busybox-binsh                   1.36.1-r5               apk     
-c-client                        2007f-r15               apk     
-ca-certificates                 20230506-r0             apk     
-ca-certificates-bundle          20230506-r0             apk     
-cachetools                      5.3.2                   python  
-certbot                         2.8.0                   python  
-certbot-dns-acmedns             0.1.0                   python  
-certbot-dns-aliyun              2.0.0                   python  
-certbot-dns-azure               2.4.0                   python  
-certbot-dns-bunny               0.0.9                   python  
-certbot-dns-cloudflare          2.8.0                   python  
-certbot-dns-cpanel              0.4.0                   python  
-certbot-dns-desec               1.2.1                   python  
-certbot-dns-digitalocean        2.8.0                   python  
-certbot-dns-directadmin         1.0.3                   python  
-certbot-dns-dnsimple            2.8.0                   python  
-certbot-dns-dnsmadeeasy         2.8.0                   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-freedns             0.1.0                   python  
-certbot-dns-gehirn              2.8.0                   python  
-certbot-dns-godaddy             2.7.4                   python  
-certbot-dns-google              2.8.0                   python  
-certbot-dns-google-domains      0.1.11                  python  
-certbot-dns-he                  1.0.0                   python  
-certbot-dns-hetzner             2.0.0                   python  
-certbot-dns-infomaniak          0.2.1                   python  
-certbot-dns-inwx                2.2.0                   python  
-certbot-dns-ionos               2023.11.13.post1        python  
-certbot-dns-linode              2.8.0                   python  
-certbot-dns-loopia              1.0.1                   python  
-certbot-dns-luadns              2.8.0                   python  
-certbot-dns-namecheap           1.0.0                   python  
-certbot-dns-netcup              1.4.3                   python  
-certbot-dns-njalla              1.0.0                   python  
-certbot-dns-nsone               2.8.0                   python  
-certbot-dns-ovh                 2.8.0                   python  
-certbot-dns-porkbun             0.8                     python  
-certbot-dns-rfc2136             2.8.0                   python  
-certbot-dns-route53             2.8.0                   python  
-certbot-dns-sakuracloud         2.8.0                   python  
-certbot-dns-standalone          1.1                     python  
-certbot-dns-transip             0.5.2                   python  
-certbot-dns-vultr               1.1.0                   python  
-certbot-plugin-gandi            1.5.0                   python  
-certifi                         2023.11.17              python  
-cffi                            1.16.0                  python  
-charset-normalizer              3.3.2                   python  
-cloudflare                      2.14.3                  python  
-configobj                       5.0.8                   python  
-coreutils                       9.3-r1                  apk     
-cryptography                    41.0.7                  python  
-curl                            8.5.0-r0                apk     
-dataclasses-json                0.5.14                  python  
-distro                          1.8.0                   python  
-dns-lexicon                     3.17.0                  python  
-dnslib                          0.9.23                  python  
-dnspython                       2.4.2                   python  
-domeneshop                      0.4.3                   python  
-fail2ban                        1.0.2                   python  
-fail2ban                        1.0.2-r2                apk     
-fail2ban-pyc                    1.0.2-r2                apk     
-filelock                        3.13.1                  python  
-fontconfig                      2.14.2-r3               apk     
-freetype                        2.13.0-r5               apk     
-future                          0.18.3                  python  
-gdbm                            1.23-r1                 apk     
-git                             2.40.1-r0               apk     
-git-perl                        2.40.1-r0               apk     
-gmp                             6.2.1-r3                apk     
-gnupg                           2.4.3-r0                apk     
-gnupg-dirmngr                   2.4.3-r0                apk     
-gnupg-gpgconf                   2.4.3-r0                apk     
-gnupg-keyboxd                   2.4.3-r0                apk     
-gnupg-utils                     2.4.3-r0                apk     
-gnupg-wks-client                2.4.3-r0                apk     
-gnutls                          3.8.0-r2                apk     
-google-api-core                 2.15.0                  python  
-google-api-python-client        2.111.0                 python  
-google-auth                     2.25.2                  python  
-google-auth-httplib2            0.2.0                   python  
-googleapis-common-protos        1.62.0                  python  
-gpg                             2.4.3-r0                apk     
-gpg-agent                       2.4.3-r0                apk     
-gpg-wks-server                  2.4.3-r0                apk     
-gpgsm                           2.4.3-r0                apk     
-gpgv                            2.4.3-r0                apk     
-httplib2                        0.22.0                  python  
-icu-data-en                     73.2-r2                 apk     
-icu-libs                        73.2-r2                 apk     
-idna                            3.6                     python  
-ip6tables                       1.8.9-r2                apk     
-iptables                        1.8.9-r2                apk     
-isodate                         0.6.1                   python  
-jmespath                        1.0.1                   python  
-josepy                          1.14.0                  python  
-jq                              1.6-r4                  apk     
-jsonlines                       4.0.0                   python  
-jsonpickle                      3.0.2                   python  
-libacl                          2.3.1-r3                apk     
-libassuan                       2.5.6-r0                apk     
-libattr                         2.5.1-r4                apk     
-libavif                         0.11.1-r2               apk     
-libbsd                          0.11.7-r1               apk     
-libbz2                          1.0.8-r5                apk     
-libc-utils                      0.7.2-r5                apk     
-libcrypto3                      3.1.4-r1                apk     
-libcurl                         8.5.0-r0                apk     
-libdav1d                        1.2.1-r0                apk     
-libedit                         20221030.3.1-r1         apk     
-libevent                        2.1.12-r6               apk     
-libexpat                        2.5.0-r1                apk     
-libffi                          3.4.4-r2                apk     
-libgcc                          12.2.1_git20220924-r10  apk     
-libgcrypt                       1.10.2-r1               apk     
-libgd                           2.3.3-r7                apk     
-libgpg-error                    1.47-r1                 apk     
-libice                          1.1.1-r2                apk     
-libidn2                         2.3.4-r1                apk     
-libintl                         0.21.1-r7               apk     
-libjpeg-turbo                   2.1.5.1-r3              apk     
-libksba                         1.6.4-r0                apk     
-libldap                         2.6.5-r0                apk     
-libmaxminddb-libs               1.7.1-r1                apk     
-libmcrypt                       2.5.8-r10               apk     
-libmd                           1.0.4-r2                apk     
-libmemcached-libs               1.1.4-r1                apk     
-libmnl                          1.0.5-r1                apk     
-libncursesw                     6.4_p20230506-r0        apk     
-libnftnl                        1.2.5-r1                apk     
-libpanelw                       6.4_p20230506-r0        apk     
-libpng                          1.6.39-r3               apk     
-libpq                           15.5-r0                 apk     
-libproc2                        4.0.4-r0                apk     
-libsasl                         2.1.28-r4               apk     
-libseccomp                      2.5.4-r2                apk     
-libsm                           1.2.4-r1                apk     
-libsodium                       1.0.18-r3               apk     
-libssl3                         3.1.4-r1                apk     
-libstdc++                       12.2.1_git20220924-r10  apk     
-libtasn1                        4.19.0-r1               apk     
-libunistring                    1.1-r1                  apk     
-libuuid                         2.38.1-r8               apk     
-libwebp                         1.3.2-r0                apk     
-libx11                          1.8.7-r0                apk     
-libxau                          1.0.11-r2               apk     
-libxcb                          1.15-r1                 apk     
-libxdmcp                        1.1.4-r2                apk     
-libxext                         1.3.5-r2                apk     
-libxml2                         2.11.6-r0               apk     
-libxpm                          3.5.16-r1               apk     
-libxslt                         1.1.38-r0               apk     
-libxt                           1.3.0-r2                apk     
-libzip                          1.9.2-r2                apk     
-linux-pam                       1.5.2-r10               apk     
-logrotate                       3.21.0-r1               apk     
-loopialib                       0.2.0                   python  
-lxml                            4.9.3                   python  
-lz4-libs                        1.9.4-r4                apk     
-marshmallow                     3.20.1                  python  
-memcached                       1.6.21-r0               apk     
-mock                            5.1.0                   python  
-mpdecimal                       2.5.1-r2                apk     
-msal                            1.26.0                  python  
-msal-extensions                 1.1.0                   python  
-musl                            1.2.4-r2                apk     
-musl-utils                      1.2.4-r2                apk     
-mypy-extensions                 1.0.0                   python  
-nano                            7.2-r1                  apk     
-ncurses-terminfo-base           6.4_p20230506-r0        apk     
-netcat-openbsd                  1.219-r1                apk     
-nettle                          3.8.1-r2                apk     
-nghttp2-libs                    1.57.0-r0               apk     
-nginx                           1.24.0-r7               apk     
-nginx-mod-devel-kit             1.24.0-r7               apk     
-nginx-mod-http-brotli           1.24.0-r7               apk     
-nginx-mod-http-dav-ext          1.24.0-r7               apk     
-nginx-mod-http-echo             1.24.0-r7               apk     
-nginx-mod-http-fancyindex       1.24.0-r7               apk     
-nginx-mod-http-geoip2           1.24.0-r7               apk     
-nginx-mod-http-headers-more     1.24.0-r7               apk     
-nginx-mod-http-image-filter     1.24.0-r7               apk     
-nginx-mod-http-perl             1.24.0-r7               apk     
-nginx-mod-http-redis2           1.24.0-r7               apk     
-nginx-mod-http-set-misc         1.24.0-r7               apk     
-nginx-mod-http-upload-progress  1.24.0-r7               apk     
-nginx-mod-http-xslt-filter      1.24.0-r7               apk     
-nginx-mod-mail                  1.24.0-r7               apk     
-nginx-mod-rtmp                  1.24.0-r7               apk     
-nginx-mod-stream                1.24.0-r7               apk     
-nginx-mod-stream-geoip2         1.24.0-r7               apk     
-nginx-vim                       1.24.0-r7               apk     
-npth                            1.6-r4                  apk     
-oniguruma                       6.9.8-r1                apk     
-openssl                         3.1.4-r1                apk     
-p11-kit                         0.24.1-r2               apk     
-packaging                       23.2                    python  
-parsedatetime                   2.6                     python  
-pcre                            8.45-r3                 apk     
-pcre2                           10.42-r1                apk     
-perl                            5.36.2-r0               apk     
-perl-error                      0.17029-r1              apk     
-perl-git                        2.40.1-r0               apk     
-php82                           8.2.13-r0               apk     
-php82-bcmath                    8.2.13-r0               apk     
-php82-bz2                       8.2.13-r0               apk     
-php82-common                    8.2.13-r0               apk     
-php82-ctype                     8.2.13-r0               apk     
-php82-curl                      8.2.13-r0               apk     
-php82-dom                       8.2.13-r0               apk     
-php82-exif                      8.2.13-r0               apk     
-php82-fileinfo                  8.2.13-r0               apk     
-php82-fpm                       8.2.13-r0               apk     
-php82-ftp                       8.2.13-r0               apk     
-php82-gd                        8.2.13-r0               apk     
-php82-gmp                       8.2.13-r0               apk     
-php82-iconv                     8.2.13-r0               apk     
-php82-imap                      8.2.13-r0               apk     
-php82-intl                      8.2.13-r0               apk     
-php82-ldap                      8.2.13-r0               apk     
-php82-mbstring                  8.2.13-r0               apk     
-php82-mysqli                    8.2.13-r0               apk     
-php82-mysqlnd                   8.2.13-r0               apk     
-php82-opcache                   8.2.13-r0               apk     
-php82-openssl                   8.2.13-r0               apk     
-php82-pdo                       8.2.13-r0               apk     
-php82-pdo_mysql                 8.2.13-r0               apk     
-php82-pdo_odbc                  8.2.13-r0               apk     
-php82-pdo_pgsql                 8.2.13-r0               apk     
-php82-pdo_sqlite                8.2.13-r0               apk     
-php82-pear                      8.2.13-r0               apk     
-php82-pecl-apcu                 5.1.22-r0               apk     
-php82-pecl-igbinary             3.2.14-r0               apk     
-php82-pecl-mcrypt               1.0.6-r0                apk     
-php82-pecl-memcached            3.2.0-r1                apk     
-php82-pecl-msgpack              2.2.0-r0                apk     
-php82-pecl-redis                6.0.2-r0                apk     
-php82-pgsql                     8.2.13-r0               apk     
-php82-phar                      8.2.13-r0               apk     
-php82-posix                     8.2.13-r0               apk     
-php82-session                   8.2.13-r0               apk     
-php82-simplexml                 8.2.13-r0               apk     
-php82-soap                      8.2.13-r0               apk     
-php82-sockets                   8.2.13-r0               apk     
-php82-sodium                    8.2.13-r0               apk     
-php82-sqlite3                   8.2.13-r0               apk     
-php82-tokenizer                 8.2.13-r0               apk     
-php82-xml                       8.2.13-r0               apk     
-php82-xmlreader                 8.2.13-r0               apk     
-php82-xmlwriter                 8.2.13-r0               apk     
-php82-xsl                       8.2.13-r0               apk     
-php82-zip                       8.2.13-r0               apk     
-pinentry                        1.2.1-r1                apk     
-pip                             23.3.1                  python  
-pkb-client                      1.2                     python  
-popt                            1.19-r2                 apk     
-portalocker                     2.8.2                   python  
-procps-ng                       4.0.4-r0                apk     
-protobuf                        4.25.1                  python  
-publicsuffixlist                0.9.4                   python  
-pyOpenSSL                       23.3.0                  python  
-pyRFC3339                       1.1                     python  
-pyacmedns                       0.4                     python  
-pyasn1                          0.5.1                   python  
-pyasn1-modules                  0.3.0                   python  
-pyc                             0.1-r0                  apk     
-pycparser                       2.21                    python  
-pyotp                           2.9.0                   python  
-pyparsing                       3.1.1                   python  
-python-dateutil                 2.8.2                   python  
-python-digitalocean             1.17.0                  python  
-python-transip                  0.6.0                   python  
-python3                         3.11.6-r0               apk     
-python3-pyc                     3.11.6-r0               apk     
-python3-pycache-pyc0            3.11.6-r0               apk     
-pytz                            2023.3.post1            python  
-readline                        8.2.1-r1                apk     
-requests                        2.31.0                  python  
-requests-file                   1.5.1                   python  
-requests-mock                   1.11.0                  python  
-rsa                             4.9                     python  
-s3transfer                      0.9.0                   python  
-scanelf                         1.3.7-r1                apk     
-setuptools                      65.5.0                  python  
-shadow                          4.13-r4                 apk     
-six                             1.16.0                  python  
-skalibs                         2.13.1.1-r1             apk     
-sniffio                         1.3.0                   python  
-soupsieve                       2.5                     python  
-sqlite-libs                     3.41.2-r2               apk     
-ssl_client                      1.36.1-r5               apk     
-tiff                            4.5.1-r0                apk     
-tldextract                      5.1.1                   python  
-typing-inspect                  0.9.0                   python  
-typing_extensions               4.9.0                   python  
-tzdata                          2023c-r1                apk     
-unixodbc                        2.3.11-r2               apk     
-uritemplate                     4.1.1                   python  
-urllib3                         2.0.7                   python  
-utmps-libs                      0.1.2.1-r1              apk     
-wheel                           0.42.0                  python  
-whois                           5.5.17-r0               apk     
-xz-libs                         5.4.3-r0                apk     
-zlib                            1.2.13-r1               apk     
-zope.interface                  6.1                     python  
-zstd-libs                       1.5.5-r4                apk     
+NAME                            VERSION                TYPE                    
+Simple Launcher                 1.1.0.14               dotnet  (+5 duplicates)  
+acme                            2.11.0                 python                   
+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.2-r0              apk                      
+aom-libs                        3.9.1-r0               apk                      
+apache2-utils                   2.4.62-r0              apk                      
+apk-tools                       2.14.4-r0              apk                      
+apr                             1.7.4-r0               apk                      
+apr-util                        1.6.3-r1               apk                      
+argon2-libs                     20190702-r5            apk                      
+attrs                           24.2.0                 python                   
+autocommand                     2.2.2                  python                   
+azure-common                    1.1.28                 python                   
+azure-core                      1.30.2                 python                   
+azure-identity                  1.17.1                 python                   
+azure-mgmt-core                 1.4.0                  python                   
+azure-mgmt-dns                  8.1.0                  python                   
+backports-tarfile               1.2.0                  python                   
+bash                            5.2.26-r0              apk                      
+beautifulsoup4                  4.12.3                 python                   
+boto3                           1.34.158               python                   
+botocore                        1.34.158               python                   
+brotli-libs                     1.1.0-r2               apk                      
+bs4                             0.0.2                  python                   
+busybox                         1.36.1-r29             apk                      
+busybox-binsh                   1.36.1-r29             apk                      
+c-ares                          1.28.1-r0              apk                      
+c-client                        2007f-r15              apk                      
+ca-certificates                 20240705-r0            apk                      
+ca-certificates-bundle          20240705-r0            apk                      
+cachetools                      5.4.0                  python                   
+catatonit                       0.2.0-r0               apk                      
+certbot                         2.11.0                 python                   
+certbot-dns-acmedns             0.1.0                  python                   
+certbot-dns-aliyun              2.0.0                  python                   
+certbot-dns-azure               2.5.0                  python                   
+certbot-dns-bunny               0.0.9                  python                   
+certbot-dns-cloudflare          2.11.0                 python                   
+certbot-dns-cpanel              0.4.0                  python                   
+certbot-dns-desec               1.2.1                  python                   
+certbot-dns-digitalocean        2.11.0                 python                   
+certbot-dns-directadmin         1.0.4                  python                   
+certbot-dns-dnsimple            2.11.0                 python                   
+certbot-dns-dnsmadeeasy         2.11.0                 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-dynudns             0.0.6                  python                   
+certbot-dns-freedns             0.2.0                  python                   
+certbot-dns-gehirn              2.11.0                 python                   
+certbot-dns-glesys              2.1.0                  python                   
+certbot-dns-godaddy             2.8.0                  python                   
+certbot-dns-google              2.11.0                 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-ionos               2024.1.8               python                   
+certbot-dns-linode              2.11.0                 python                   
+certbot-dns-loopia              1.0.1                  python                   
+certbot-dns-luadns              2.11.0                 python                   
+certbot-dns-namecheap           1.0.0                  python                   
+certbot-dns-netcup              1.4.3                  python                   
+certbot-dns-njalla              1.0.0                  python                   
+certbot-dns-nsone               2.11.0                 python                   
+certbot-dns-ovh                 2.11.0                 python                   
+certbot-dns-porkbun             0.8                    python                   
+certbot-dns-rfc2136             2.11.0                 python                   
+certbot-dns-route53             2.11.0                 python                   
+certbot-dns-sakuracloud         2.11.0                 python                   
+certbot-dns-standalone          1.1                    python                   
+certbot-dns-transip             0.5.2                  python                   
+certbot-dns-vultr               1.1.0                  python                   
+certbot-plugin-gandi            1.5.0                  python                   
+certifi                         2024.7.4               python                   
+cffi                            1.17.0                 python                   
+charset-normalizer              3.3.2                  python                   
+cloudflare                      2.19.4                 python                   
+composer                        2.7.7                  binary                   
+configargparse                  1.7                    python                   
+configobj                       5.0.8                  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.0                 python                   
+curl                            8.9.0-r0               apk                      
+distro                          1.9.0                  python                   
+dns-lexicon                     3.17.0                 python                   
+dnslib                          0.9.25                 python                   
+dnspython                       2.6.1                  python                   
+domeneshop                      0.4.4                  python                   
+fail2ban                        1.1.0                  python                   
+fail2ban                        1.1.0-r0               apk                      
+fail2ban-pyc                    1.1.0-r0               apk                      
+filelock                        3.15.4                 python                   
+findutils                       4.9.0-r5               apk                      
+fontconfig                      2.15.0-r1              apk                      
+freetype                        2.13.2-r0              apk                      
+future                          1.0.0                  python                   
+gdbm                            1.23-r1                apk                      
+git                             2.45.2-r0              apk                      
+git-init-template               2.45.2-r0              apk                      
+git-perl                        2.45.2-r0              apk                      
+gmp                             6.3.0-r1               apk                      
+gnupg                           2.4.5-r0               apk                      
+gnupg-dirmngr                   2.4.5-r0               apk                      
+gnupg-gpgconf                   2.4.5-r0               apk                      
+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.19.1                 python                   
+google-api-python-client        2.140.0                python                   
+google-auth                     2.33.0                 python                   
+google-auth-httplib2            0.2.0                  python                   
+googleapis-common-protos        1.63.2                 python                   
+gpg                             2.4.5-r0               apk                      
+gpg-agent                       2.4.5-r0               apk                      
+gpg-wks-server                  2.4.5-r0               apk                      
+gpgsm                           2.4.5-r0               apk                      
+gpgv                            2.4.5-r0               apk                      
+httplib2                        0.22.0                 python                   
+icu-data-en                     74.2-r0                apk                      
+icu-libs                        74.2-r0                apk                      
+idna                            3.7                    python                   
+importlib-metadata              8.0.0                  python                   
+importlib-resources             6.4.0                  python                   
+inflect                         7.3.1                  python                   
+iptables                        1.8.10-r3              apk                      
+iptables-legacy                 1.8.10-r3              apk                      
+isodate                         0.6.1                  python                   
+jaraco-context                  5.3.0                  python                   
+jaraco-functools                4.0.1                  python                   
+jaraco-text                     3.12.1                 python                   
+jmespath                        1.0.1                  python                   
+josepy                          1.14.0                 python                   
+jq                              1.7.1-r0               apk                      
+jsonlines                       4.0.0                  python                   
+jsonpickle                      3.2.2                  python                   
+libacl                          2.3.2-r0               apk                      
+libassuan                       2.5.7-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.1-r3               apk                      
+libcurl                         8.9.0-r0               apk                      
+libdav1d                        1.4.2-r0               apk                      
+libedit                         20240517.3.1-r0        apk                      
+libevent                        2.1.12-r7              apk                      
+libexpat                        2.6.2-r0               apk                      
+libffi                          3.4.6-r0               apk                      
+libgcc                          13.2.1_git20240309-r0  apk                      
+libgcrypt                       1.10.3-r0              apk                      
+libgd                           2.3.3-r9               apk                      
+libgpg-error                    1.49-r0                apk                      
+libice                          1.1.1-r6               apk                      
+libidn2                         2.3.7-r0               apk                      
+libintl                         0.22.5-r0              apk                      
+libip4tc                        1.8.10-r3              apk                      
+libip6tc                        1.8.10-r3              apk                      
+libjpeg-turbo                   3.0.3-r0               apk                      
+libksba                         1.6.6-r0               apk                      
+libldap                         2.6.7-r0               apk                      
+libmaxminddb-libs               1.9.1-r0               apk                      
+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-r0       apk                      
+libnftnl                        1.2.6-r0               apk                      
+libpanelw                       6.4_p20240420-r0       apk                      
+libpng                          1.6.43-r0              apk                      
+libpq                           16.3-r0                apk                      
+libproc2                        4.0.4-r0               apk                      
+libpsl                          0.21.5-r1              apk                      
+libsasl                         2.1.28-r6              apk                      
+libseccomp                      2.5.5-r1               apk                      
+libsharpyuv                     1.3.2-r0               apk                      
+libsm                           1.2.4-r4               apk                      
+libsodium                       1.0.19-r0              apk                      
+libssl3                         3.3.1-r3               apk                      
+libstdc++                       13.2.1_git20240309-r0  apk                      
+libtasn1                        4.19.0-r2              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                      
+libxslt                         1.1.39-r1              apk                      
+libxt                           1.3.0-r5               apk                      
+libxtables                      1.8.10-r3              apk                      
+libzip                          1.10.1-r0              apk                      
+linux-pam                       1.6.0-r0               apk                      
+logrotate                       3.21.0-r1              apk                      
+loopialib                       0.2.0                  python                   
+lxml                            5.2.2                  python                   
+lz4-libs                        1.9.4-r5               apk                      
+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.30.0                 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-r0       apk                      
+netcat-openbsd                  1.226-r0               apk                      
+nettle                          3.9.1-r0               apk                      
+nghttp2-libs                    1.62.1-r0              apk                      
+nginx                           1.26.1-r0              apk                      
+nginx-mod-devel-kit             1.26.1-r0              apk                      
+nginx-mod-http-brotli           1.26.1-r0              apk                      
+nginx-mod-http-dav-ext          1.26.1-r0              apk                      
+nginx-mod-http-echo             1.26.1-r0              apk                      
+nginx-mod-http-fancyindex       1.26.1-r0              apk                      
+nginx-mod-http-geoip2           1.26.1-r0              apk                      
+nginx-mod-http-headers-more     1.26.1-r0              apk                      
+nginx-mod-http-image-filter     1.26.1-r0              apk                      
+nginx-mod-http-perl             1.26.1-r0              apk                      
+nginx-mod-http-redis2           1.26.1-r0              apk                      
+nginx-mod-http-set-misc         1.26.1-r0              apk                      
+nginx-mod-http-upload-progress  1.26.1-r0              apk                      
+nginx-mod-http-xslt-filter      1.26.1-r0              apk                      
+nginx-mod-mail                  1.26.1-r0              apk                      
+nginx-mod-rtmp                  1.26.1-r0              apk                      
+nginx-mod-stream                1.26.1-r0              apk                      
+nginx-mod-stream-geoip2         1.26.1-r0              apk                      
+nginx-vim                       1.26.1-r0              apk                      
+npth                            1.6-r4                 apk                      
+oniguruma                       6.9.9-r0               apk                      
+openssl                         3.3.1-r3               apk                      
+ordered-set                     4.1.0                  python                   
+p11-kit                         0.25.3-r0              apk                      
+packaging                       24.1                   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.10-r0              apk                      
+php83-bcmath                    8.3.10-r0              apk                      
+php83-bz2                       8.3.10-r0              apk                      
+php83-common                    8.3.10-r0              apk                      
+php83-ctype                     8.3.10-r0              apk                      
+php83-curl                      8.3.10-r0              apk                      
+php83-dom                       8.3.10-r0              apk                      
+php83-exif                      8.3.10-r0              apk                      
+php83-fileinfo                  8.3.10-r0              apk                      
+php83-fpm                       8.3.10-r0              apk                      
+php83-ftp                       8.3.10-r0              apk                      
+php83-gd                        8.3.10-r0              apk                      
+php83-gmp                       8.3.10-r0              apk                      
+php83-iconv                     8.3.10-r0              apk                      
+php83-imap                      8.3.10-r0              apk                      
+php83-intl                      8.3.10-r0              apk                      
+php83-ldap                      8.3.10-r0              apk                      
+php83-mbstring                  8.3.10-r0              apk                      
+php83-mysqli                    8.3.10-r0              apk                      
+php83-mysqlnd                   8.3.10-r0              apk                      
+php83-opcache                   8.3.10-r0              apk                      
+php83-openssl                   8.3.10-r0              apk                      
+php83-pdo                       8.3.10-r0              apk                      
+php83-pdo_mysql                 8.3.10-r0              apk                      
+php83-pdo_odbc                  8.3.10-r0              apk                      
+php83-pdo_pgsql                 8.3.10-r0              apk                      
+php83-pdo_sqlite                8.3.10-r0              apk                      
+php83-pear                      8.3.10-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.2.0-r0               apk                      
+php83-pecl-msgpack              2.2.0-r2               apk                      
+php83-pecl-redis                6.0.2-r0               apk                      
+php83-pgsql                     8.3.10-r0              apk                      
+php83-phar                      8.3.10-r0              apk                      
+php83-posix                     8.3.10-r0              apk                      
+php83-session                   8.3.10-r0              apk                      
+php83-simplexml                 8.3.10-r0              apk                      
+php83-soap                      8.3.10-r0              apk                      
+php83-sockets                   8.3.10-r0              apk                      
+php83-sodium                    8.3.10-r0              apk                      
+php83-sqlite3                   8.3.10-r0              apk                      
+php83-tokenizer                 8.3.10-r0              apk                      
+php83-xml                       8.3.10-r0              apk                      
+php83-xmlreader                 8.3.10-r0              apk                      
+php83-xmlwriter                 8.3.10-r0              apk                      
+php83-xsl                       8.3.10-r0              apk                      
+php83-zip                       8.3.10-r0              apk                      
+pinentry                        1.3.0-r0               apk                      
+pip                             24.2                   python                   
+pkb-client                      1.2                    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.24.0                 python                   
+protobuf                        5.27.3                 python                   
+pyacmedns                       0.4                    python                   
+pyasn1                          0.6.0                  python                   
+pyasn1-modules                  0.4.0                  python                   
+pyc                             3.12.3-r1              apk                      
+pycparser                       2.22                   python                   
+pyjwt                           2.9.0                  python                   
+pynamecheap                     0.0.3                  python                   
+pyopenssl                       24.2.1                 python                   
+pyotp                           2.9.0                  python                   
+pyparsing                       3.1.2                  python                   
+pyrfc3339                       1.1                    python                   
+python-dateutil                 2.9.0.post0            python                   
+python-digitalocean             1.17.0                 python                   
+python-transip                  0.6.0                  python                   
+python3                         3.12.3-r1              apk                      
+python3-pyc                     3.12.3-r1              apk                      
+python3-pycache-pyc0            3.12.3-r1              apk                      
+pytz                            2024.1                 python                   
+pyyaml                          6.0.2                  python                   
+readline                        8.2.10-r0              apk                      
+requests                        2.32.3                 python                   
+requests-file                   2.1.0                  python                   
+requests-mock                   1.12.1                 python                   
+rsa                             4.9                    python                   
+s3transfer                      0.10.2                 python                   
+scanelf                         1.3.7-r2               apk                      
+setuptools                      72.1.0                 python                   
+shadow                          4.15.1-r0              apk                      
+six                             1.16.0                 python                   
+skalibs                         2.14.1.1-r0            apk                      
+soupsieve                       2.5                    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                   
+tomli                           2.0.1                  python                   
+typeguard                       4.3.0                  python                   
+typing-extensions               4.12.2                 python  (+1 duplicate)   
+tzdata                          2024a-r1               apk                      
+unixodbc                        2.3.12-r0              apk                      
+uritemplate                     4.1.1                  python                   
+urllib3                         2.2.2                  python                   
+utmps-libs                      0.1.2.2-r1             apk                      
+wheel                           0.43.0                 python                   
+wheel                           0.44.0                 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.0.1                  python                   
+zstd-libs                       1.5.6-r0               apk                      
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -7,40 +7,24 @@ project_logo: "https://github.com/linuxserver/docker-templates/raw/master/linuxs
 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 }}"

-project_blurb_optional_extras_enabled: false
-project_blurb_optional_extras: []
-
 # supported architectures
 available_architectures:
  - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}

-# development version
-development_versions: false
-development_versions_items:
-  - { tag: "latest", desc: "Stable releases" }
-
-
 # container parameters
-common_param_env_vars_enabled: true #PGID, PUID, etc, you can set it to 'optional'
+common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
-param_usage_include_net: false #you can set it to 'optional'
-param_net: "host"
-param_net_desc: "Shares host networking with container."
 param_usage_include_env: true
 param_env_vars:
-  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
  - { 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: "VALIDATION", env_value: "http", desc: "Certbot validation method to use, options are `http` or `dns` (`dns` method also requires `DNSPLUGIN` variable set)." }
+  - { 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/appdata/config", desc: "All the config files including the webroot reside here." }
+  - { 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" }
-param_device_map: false
-param_devices:
-  - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" }
 cap_add_param: true
 cap_add_param_vars:
  - { cap_add_var: "NET_ADMIN" }
@@ -50,27 +34,15 @@ opt_param_usage_include_env: true
 opt_param_env_vars:
  - { env_var: "SUBDOMAINS", env_value: "www,", desc: "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)" }
  - { env_var: "CERTPROVIDER", env_value: "", desc: "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." }
-  - { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `freedns`, `gandi`, `gehirn`, `godaddy`, `google`, `google-domains`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip`, and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." }
+  - { env_var: "DNSPLUGIN", env_value: "cloudflare", desc: "Required if `VALIDATION` is set to `dns`. Options are `acmedns`, `aliyun`, `azure`, `bunny`, `cloudflare`, `cpanel`, `desec`, `digitalocean`, `directadmin`, `dnsimple`, `dnsmadeeasy`, `dnspod`, `do`, `domeneshop`, `dreamhost`, `duckdns`, `dynudns`, `freedns`, `gandi`, `gehirn`, `glesys`, `godaddy`, `google`, `he`, `hetzner`, `infomaniak`, `inwx`, `ionos`, `linode`, `loopia`, `luadns`, `namecheap`, `netcup`, `njalla`, `nsone`, `ovh`, `porkbun`, `rfc2136`, `route53`, `sakuracloud`, `standalone`, `transip`, and `vultr`. Also need to enter the credentials into the corresponding ini (or json for some plugins) file under `/config/dns-conf`." }
  - { 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: "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_vols: false
-opt_param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Configuration files." }
 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)" }
-opt_param_device_map: false
-opt_param_devices:
-  - { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" }
-opt_cap_add_param: false
-opt_cap_add_param_vars:
-  - { cap_add_var: "NET_ADMIN" }
-
-optional_block_1: false
-optional_block_1_items: ""

 # application setup block
 app_setup_block_enabled: true
@@ -92,7 +64,7 @@ app_setup_block: |

  ### Certbot Plugins

-  SWAG includes many Certbot plugins out of the box, but not all plugins can be includes.
+  SWAG includes many Certbot plugins out of the box, but not all plugins can be included.
  If you need a plugin that is not included, the quickest way to have the plugin available is to use our [Universal Package Install Docker Mod](https://github.com/linuxserver/docker-mods/tree/universal-package-install).

  Set the following environment variables on your container:
@@ -168,6 +140,15 @@ app_setup_block: |

 # changelog
 changelogs:
+  - { date: "24.07.14:", desc: "Rebase to Alpine 3.20. Remove deprecated Google Domains certbot plugin. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
+  - { date: "01.07.24:", desc: "Fall back to iptables-legacy if iptables doesn't work." }
+  - { date: "23.03.24:", desc: "Fix perms on the generated `priv-fullchain-bundle.pem`." }
+  - { date: "14.03.24:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) authelia-location.conf, authelia-server.conf - Update Authelia conf samples with support for 4.38." }
+  - { date: "11.03.24:", desc: "Restore support for DynuDNS using `certbot-dns-dynudns`." }
+  - { date: "06.03.24:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Cleanup default site conf." }
+  - { date: "04.03.24:", desc: "Remove `stream.conf` inside the container to allow users to include their own block in `nginx.conf`." }
+  - { date: "23.01.24:", desc: "Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate." }
+  - { date: "01.01.24:", desc: "Add GleSYS DNS plugin." }
  - { date: "11.12.23:", desc: "Deprecate certbot-dns-dynu to resolve dependency conflicts with other plugins." }
  - { date: "30.11.23:", desc: "[Existing users should update:](https://github.com/linuxserver/docker-swag/blob/master/README.md#updating-configs) site-confs/default.conf - Fix index.php being downloaded on 404." }
  - { date: "23.11.23:", desc: "Run certbot as root to allow fix http validation." }
--- a/root/defaults/dns-conf/dynu-credentials.ini
+++ b/root/defaults/dns-conf/dynu-credentials.ini
@@ -0,0 +1,3 @@
+# Instructions: https://github.com/DustyRah/certbot-dns-dynudns
+# Replace with your API token from your dynudns account.
+dns_dynu_auth_token = AbCbASsd!@34
--- a/root/defaults/dns-conf/glesys.ini
+++ b/root/defaults/dns-conf/glesys.ini
@@ -0,0 +1,5 @@
+# Instructions: https://github.com/runfalk/certbot-dns-glesys#usage
+
+# GleSYS API credentials used by Certbot
+dns_glesys_user = CL00000
+dns_glesys_password = apikeygoeshere
--- a/root/defaults/dns-conf/google-domains.ini
+++ b/root/defaults/dns-conf/google-domains.ini
@@ -1,4 +0,0 @@
-# Instructions: https://github.com/aaomidi/certbot-dns-google-domains#credentials
-# Replace with your value
-dns_google_domains_access_token = abcdef
-dns_google_domains_zone = example.com
--- a/root/defaults/etc/letsencrypt/renewal-hooks/deploy/10-default
+++ b/root/defaults/etc/letsencrypt/renewal-hooks/deploy/10-default
@@ -5,4 +5,5 @@ cd /config/keys/letsencrypt || exit 1
 openssl pkcs12 -export -out privkey.pfx -inkey privkey.pem -in cert.pem -certfile chain.pem -passout pass:
 sleep 1
 cat {privkey,fullchain}.pem >priv-fullchain-bundle.pem
+chmod 600 priv-fullchain-bundle.pem
 chown -R abc:abc /config/etc/letsencrypt
--- a/root/defaults/nginx/authelia-location.conf.sample
+++ b/root/defaults/nginx/authelia-location.conf.sample
@@ -1,10 +1,15 @@
-## Version 2023/04/27 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-location.conf.sample
+## Version 2024/03/14 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-location.conf.sample
 # Make sure that your authelia container is in the same user defined bridge network and is named authelia
 # Rename /config/nginx/proxy-confs/authelia.subdomain.conf.sample to /config/nginx/proxy-confs/authelia.subdomain.conf
-# Make sure that the authelia configuration.yml has 'path: "authelia"' defined
+# For authelia 4.37 and below, make sure that the authelia configuration.yml has 'path: "authelia"' defined
+# For authelia 4.38 and above, make sure that the authelia configuration.yml has 'address: "tcp://:9091/authelia"' defined

 ## Send a subrequest to Authelia to verify if the user is authenticated and has permission to access the resource
-auth_request /authelia/api/verify;
+## For authelia 4.37 and below, use the following line
+# auth_request /authelia/api/verify;
+## For authelia 4.38 and above, use the following line
+auth_request /authelia/api/authz/auth-request;
+
 ## If the subreqest returns 200 pass to the backend, if the subrequest returns 401 redirect to the portal
 error_page 401 = @authelia_proxy_signin;

--- a/root/defaults/nginx/authelia-server.conf.sample
+++ b/root/defaults/nginx/authelia-server.conf.sample
@@ -1,18 +1,20 @@
-## Version 2023/04/27 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-server.conf.sample
+## Version 2024/03/16 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/authelia-server.conf.sample
 # Make sure that your authelia container is in the same user defined bridge network and is named authelia
 # Rename /config/nginx/proxy-confs/authelia.subdomain.conf.sample to /config/nginx/proxy-confs/authelia.subdomain.conf
-# Make sure that the authelia configuration.yml has 'path: "authelia"' defined
+# For authelia 4.37 and below, make sure that the authelia configuration.yml has 'path: "authelia"' defined
+# For authelia 4.38 and above, make sure that the authelia configuration.yml has 'address: "tcp://:9091/authelia"' defined

 # location for authelia subfolder requests
 location ^~ /authelia {
    auth_request off; # requests to this subfolder must be accessible without authentication
+
    include /config/nginx/proxy.conf;
    include /config/nginx/resolver.conf;
    set $upstream_authelia authelia;
    proxy_pass http://$upstream_authelia:9091;
 }

-# location for authelia auth requests
+# location for authelia 4.37 and below auth requests
 location = /authelia/api/verify {
    internal;

@@ -29,6 +31,23 @@ location = /authelia/api/verify {
    proxy_set_header Content-Length "";
 }

+# location for authelia 4.38 and above auth requests
+location = /authelia/api/authz/auth-request {
+    internal;
+
+    include /config/nginx/proxy.conf;
+    include /config/nginx/resolver.conf;
+    set $upstream_authelia authelia;
+    proxy_pass http://$upstream_authelia:9091;
+
+    ## Include the Set-Cookie header if present
+    auth_request_set $set_cookie $upstream_http_set_cookie;
+    add_header Set-Cookie $set_cookie;
+
+    proxy_pass_request_body off;
+    proxy_set_header Content-Length "";
+}
+
 # virtual location for authelia 401 redirects
 location @authelia_proxy_signin {
    internal;
--- a/root/defaults/nginx/authentik-location.conf.sample
+++ b/root/defaults/nginx/authentik-location.conf.sample
@@ -4,6 +4,7 @@

 ## Send a subrequest to Authentik to verify if the user is authenticated and has permission to access the resource
 auth_request /outpost.goauthentik.io/auth/nginx;
+
 ## If the subreqest returns 200 pass to the backend, if the subrequest returns 401 redirect to the portal
 error_page 401 = @goauthentik_proxy_signin;

--- a/root/defaults/nginx/authentik-server.conf.sample
+++ b/root/defaults/nginx/authentik-server.conf.sample
@@ -5,6 +5,7 @@
 # location for authentik subfolder requests
 location ^~ /outpost.goauthentik.io {
    auth_request off; # requests to this subfolder must be accessible without authentication
+
    include /config/nginx/proxy.conf;
    include /config/nginx/resolver.conf;
    set $upstream_authentik authentik-server;
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -1,4 +1,4 @@
-## Version 2023/11/27 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2024/07/16 - Changelog: https://github.com/linuxserver/docker-swag/commits/master/root/defaults/nginx/site-confs/default.conf.sample

 # redirect all traffic to https
 server {
@@ -12,8 +12,8 @@ server {

 # main server block
 server {
-    listen 443 ssl http2 default_server;
-    listen [::]:443 ssl http2 default_server;
+    listen 443 ssl default_server;
+    listen [::]:443 ssl default_server;

    server_name _;

@@ -48,7 +48,7 @@ server {
        # enable for Authentik (requires authentik-server.conf in the server block)
        #include /config/nginx/authentik-location.conf;

-        try_files $uri $uri/ /index.html /index.php$is_args$args;
+        try_files $uri $uri/ /index.html /index.htm /index.php$is_args$args;
    }

    location ~ ^(.+\.php)(.*)$ {
@@ -65,8 +65,8 @@ server {
        # enable for Authentik (requires authentik-server.conf in the server block)
        #include /config/nginx/authentik-location.conf;

-        try_files $fastcgi_script_name =404;
        fastcgi_split_path_info ^(.+\.php)(.*)$;
+        if (!-f $document_root$fastcgi_script_name) { return 404; }
        fastcgi_pass 127.0.0.1:9000;
        fastcgi_index index.php;
        include /etc/nginx/fastcgi_params;
--- a/root/etc/crontabs/root
+++ b/root/etc/crontabs/root
@@ -1,2 +1,8 @@
 # min   hour    day     month   weekday command
+*/15    *       *       *       *       run-parts /etc/periodic/15min
+0       *       *       *       *       run-parts /etc/periodic/hourly
+0       2       *       *       *       run-parts /etc/periodic/daily
+0       3       *       *       6       run-parts /etc/periodic/weekly
+0       5       1       *       *       run-parts /etc/periodic/monthly
+
 8       2       *       *       *       /app/le-renew.sh >> /config/log/letsencrypt/letsencrypt.log 2>&1
--- a/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-certbot-config/run
@@ -23,6 +23,13 @@ for i in "${SANED_VARS[@]}"; do
    export echo "${i}"="$(echo "${!i}" | tr '[:upper:]' '[:lower:]')"
 done

+# Check for and install requested DNS plugins
+if grep -q "universal-package-install" <<< "${DOCKER_MODS}" && grep -q "certbot-dns" <<< "${INSTALL_PIP_PACKAGES}"; then
+    echo "**** Installing requested dns plugins ****"
+    /etc/s6-overlay/s6-rc.d/init-mod-universal-package-install-add-package/run
+    /etc/s6-overlay/s6-rc.d/init-mods-package-install/run
+fi
+
 # check to make sure DNSPLUGIN is selected if dns validation is used
 CERTBOT_DNS_AUTHENTICATORS=$(certbot plugins --authenticators 2>/dev/null | sed -e 's/^Entry point: EntryPoint(name='\''cpanel'\''/Entry point: EntryPoint(name='\''dns-cpanel'\''/' -e '/EntryPoint(name='\''dns-/!d' -e 's/^Entry point: EntryPoint(name='\''dns-\([^ ]*\)'\'',/\1/' | sort)
 if [[ "${VALIDATION}" = "dns" ]] && ! echo "${CERTBOT_DNS_AUTHENTICATORS}" | grep -q "${DNSPLUGIN}"; then
--- a/root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-fail2ban-config/run
@@ -1,6 +1,15 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash

+if ! iptables -L &> /dev/null; then
+  ln -sf /sbin/xtables-legacy-multi /sbin/iptables
+  ln -sf /sbin/xtables-legacy-multi /sbin/iptables-save
+  ln -sf /sbin/xtables-legacy-multi /sbin/iptables-restore
+  ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables
+  ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables-save
+  ln -sf /sbin/xtables-legacy-multi /sbin/ip6tables-restore
+fi
+
 # copy/update the fail2ban config defaults to/in /config
 cp -R /defaults/fail2ban/filter.d /config/fail2ban/
 cp -R /defaults/fail2ban/action.d /config/fail2ban/
--- a/root/etc/s6-overlay/s6-rc.d/init-samples-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-samples-config/run
@@ -9,5 +9,5 @@ if [[ -d /defaults/nginx/proxy-confs/ ]]; then
        -maxdepth 1 \
        -name "*.conf.sample" \
        -type f \
-        -exec cp "{}" /config/nginx/proxy-confs/ +
+        -exec cp "{}" /config/nginx/proxy-confs/ \;
 fi
Author	SHA1	Message	Date
LinuxServer-CI	a8cf2c5c40	Bot Updating Package Versions	2024-08-10 03:27:12 +00:00
driz	62faebf642	Merge pull request #497 from linuxserver/readme-typo fix typo	2024-08-07 08:30:01 -04:00
LinuxServer-CI	81e65837ca	Bot Updating Package Versions	2024-08-07 12:08:32 +00:00
driz	a08edc14d2	fix typo	2024-08-07 08:06:25 -04:00
LinuxServer-CI	edf1abd83a	Bot Updating Templated Files	2024-08-07 12:04:22 +00:00
driz	0357efea87	Merge pull request #491 from marblepebble/master Fallback to iptables-legacy if iptables doesn't work	2024-08-07 08:01:42 -04:00
LinuxServer-CI	aa103ce997	Bot Updating Package Versions	2024-08-03 03:20:38 +00:00
marblepebble	20bbf040e0	Merge branch 'master' into master	2024-07-30 21:39:57 +01:00
Ainsley Pereira	e4a6e31b6f	Add iptables-legacy to Dockerfile.aarch64 too	2024-07-30 21:24:12 +01:00
LinuxServer-CI	5b096a8a66	Bot Updating Package Versions	2024-07-27 03:22:59 +00:00
LinuxServer-CI	eb6dba6cbe	Bot Updating Package Versions	2024-07-19 22:27:05 +00:00
LinuxServer-CI	afd6c9d827	Bot Updating Package Versions	2024-07-19 21:42:49 +00:00
Eric Nemchik	daa84f28b4	Merge pull request #492 from linuxserver/3.20 Rebase to 3.20	2024-07-19 16:36:39 -05:00
Eric Nemchik	cd931076e4	remove google-domains certbot plugin Signed-off-by: GitHub <noreply@github.com>	2024-07-17 17:18:24 +00:00
Eric Nemchik	f5ce44887f	keep ipv6 listen separate Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-07-16 19:48:55 -05:00
Eric Nemchik	875a17dfc7	Rebase to 3.20 Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-07-14 09:57:01 -05:00
LinuxServer-CI	210134745d	Bot Updating Package Versions	2024-07-13 03:24:57 +00:00
LinuxServer-CI	9d469c2957	Bot Updating Templated Files	2024-07-13 03:20:42 +00:00
LinuxServer-CI	37e64ebdac	Bot Updating Templated Files	2024-07-13 03:19:19 +00:00
LinuxServer-CI	47fc525094	Bot Updating Package Versions	2024-07-06 03:24:36 +00:00
Ainsley Pereira	625b11d21c	Add iptables-legacy and fall back to it if the normal iptables command doesn't work. Fixes #476	2024-07-01 17:28:48 +01:00
LinuxServer-CI	77accb3762	Bot Updating Package Versions	2024-06-29 03:24:09 +00:00
LinuxServer-CI	7dcce8b346	Bot Updating Package Versions	2024-06-22 03:22:28 +00:00
LinuxServer-CI	03286fc238	Bot Updating Package Versions	2024-06-15 03:20:18 +00:00
LinuxServer-CI	7391dc1bcf	Bot Updating Package Versions	2024-06-08 03:20:15 +00:00
LinuxServer-CI	a7ea6a955b	Bot Updating Package Versions	2024-06-06 03:23:13 +00:00
LinuxServer-CI	e149638808	Bot Updating Package Versions	2024-06-01 03:22:21 +00:00
LinuxServer-CI	41cb7cb104	Bot Updating Package Versions	2024-05-25 03:27:08 +00:00
LinuxServer-CI	1499cbe7de	Bot Updating Templated Files	2024-05-25 03:23:50 +00:00
LinuxServer-CI	5a7d49ec43	Bot Updating Templated Files	2024-05-25 03:21:31 +00:00
LinuxServer-CI	efc2f55f48	Bot Updating Package Versions	2024-05-18 03:20:19 +00:00
LinuxServer-CI	95c13d0082	Bot Updating Package Versions	2024-05-11 03:22:43 +00:00
LinuxServer-CI	e05fc4b1e3	Bot Updating Templated Files	2024-05-11 03:18:51 +00:00
LinuxServer-CI	099e0e75a4	Bot Updating Package Versions	2024-05-04 03:23:10 +00:00
LinuxServer-CI	fc1675f3a1	Bot Updating Templated Files	2024-05-04 03:19:21 +00:00
LinuxServer-CI	dc1bc6d5b3	Bot Updating Package Versions	2024-04-27 03:19:53 +00:00
LinuxServer-CI	db6f61bd27	Bot Updating Package Versions	2024-04-20 03:19:29 +00:00
LinuxServer-CI	67f864c7b9	Bot Updating Package Versions	2024-04-18 22:03:11 +00:00
aptalca	3f885d0415	Merge pull request #472 from linuxserver/find fix find for gnu	2024-04-18 17:59:23 -04:00
aptalca	280c4bde4b	fix find for gnu	2024-04-18 15:53:44 -04:00
LinuxServer-CI	59e7865464	Bot Updating Package Versions	2024-04-13 03:15:36 +00:00
LinuxServer-CI	5c58fa9383	Bot Updating Package Versions	2024-04-06 03:20:55 +00:00
LinuxServer-CI	ae19b93cc7	Bot Updating Package Versions	2024-04-04 01:06:33 +00:00
LinuxServer-CI	5dee340726	Bot Updating Package Versions	2024-03-30 03:21:19 +00:00
aptalca	3109ff8d9c	Merge pull request #468 from linuxserver/keyperm fix perms on generated priv-fullchain-bundle.pem	2024-03-23 11:42:50 -04:00
aptalca	4239dc22d4	fix perms on generated priv-fullchain-bundle.pem	2024-03-23 11:10:04 -04:00
LinuxServer-CI	44c6bd721b	Bot Updating Package Versions	2024-03-23 12:36:24 +00:00
LinuxServer-CI	d4a6be8fad	Bot Updating Templated Files	2024-03-23 12:32:28 +00:00
Adam	a66b478d1d	Merge pull request #463 from linuxserver/restore-dynudns Restore dynudns plugin	2024-03-23 12:29:52 +00:00
LinuxServer-CI	9efac76e25	Bot Updating Package Versions	2024-03-23 03:19:27 +00:00
TheSpad	23c6384f2c	Merge branch 'master' into restore-dynudns	2024-03-19 22:49:45 +00:00
aptalca	13ede8ea87	Merge pull request #467 from linuxserver/authelia-auth-endpoints another authelia auth endpoint adjustment	2024-03-17 16:24:55 -04:00
Eric Nemchik	a9391d07ee	another authelia auth endpoint adjustment Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-03-16 12:34:59 -05:00
LinuxServer-CI	a00d272297	Bot Updating Package Versions	2024-03-16 03:18:58 +00:00
LinuxServer-CI	0207bd8f30	Bot Updating Templated Files	2024-03-15 18:26:27 +00:00
Eric Nemchik	3fd209d686	Merge pull request #466 from linuxserver/nemchik-patch-1 Update readme-vars.yml	2024-03-15 13:23:06 -05:00
Eric Nemchik	87ced3fd3e	Update readme-vars.yml	2024-03-15 13:08:37 -05:00
Eric Nemchik	3e342b0529	Update readme-vars.yml	2024-03-15 13:07:59 -05:00
LinuxServer-CI	c9504bb55f	Bot Updating Package Versions	2024-03-15 15:55:24 +00:00
LinuxServer-CI	2573149089	Bot Updating Templated Files	2024-03-15 15:50:23 +00:00
Eric Nemchik	9b3f418afd	Merge pull request #465 from linuxserver/authelia-4.38-alt support for authelia 4.38+	2024-03-15 10:48:40 -05:00
Eric Nemchik	c63b437e1f	Update comments Signed-off-by: GitHub <noreply@github.com>	2024-03-15 14:41:19 +00:00
Eric Nemchik	f14c6a7a3a	support for authelia 4.38+ Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-03-14 21:57:51 -05:00
TheSpad	4b4c103df4	Restore dynudns plugin	2024-03-11 11:12:28 +00:00
LinuxServer-CI	26203c8c40	Bot Updating Package Versions	2024-03-09 03:21:46 +00:00
LinuxServer-CI	259850fcc5	Bot Updating Templated Files	2024-03-06 17:43:29 +00:00
Eric Nemchik	c6474f07ea	Cleanup default site conf (#442 ) * Cleanup default site conf Signed-off-by: Eric Nemchik <eric@nemchik.com> * update date --------- Signed-off-by: Eric Nemchik <eric@nemchik.com> Co-authored-by: aptalca <541623+aptalca@users.noreply.github.com>	2024-03-06 12:41:52 -05:00
LinuxServer-CI	b6a196b93a	Bot Updating Package Versions	2024-03-06 16:22:38 +00:00
aptalca	3967276f06	Merge pull request #459 from linuxserver/stream remove stream.conf	2024-03-06 11:18:47 -05:00
aptalca	4853736c4e	add comment	2024-03-06 09:44:39 -05:00
aptalca	a8d03c5280	Merge pull request #460 from linuxserver/package-install Run package installer as part of SWAG init to prevent init fail due to missing dns plugin	2024-03-05 08:31:23 -05:00
aptalca	907dfc8c03	Revert "Update root/etc/s6-overlay/s6-rc.d/init-certbot-config/run" This reverts commit `bf21a51e10`.	2024-03-04 20:19:53 -05:00
aptalca	bf21a51e10	Update root/etc/s6-overlay/s6-rc.d/init-certbot-config/run Co-authored-by: Eric Nemchik <eric@nemchik.com>	2024-03-04 19:33:01 -05:00
aptalca	32f72ac0b4	make it pretty, grep `certbot-dns`	2024-03-04 18:33:13 -05:00
aptalca	970fa75e87	run scripts direct	2024-03-04 18:23:04 -05:00
aptalca	137ad9f52e	Run package installer as part of SWAG init to prevent init fail due to missing dns plugin	2024-03-04 18:10:49 -05:00
aptalca	5d0ec79ac5	remove stream.conf	2024-03-04 17:56:25 -05:00
LinuxServer-CI	3145477f72	Bot Updating Package Versions	2024-03-04 22:52:37 +00:00
aptalca	58b9470c52	Merge pull request #458 from linuxserver/edgerepo package moved to community repo	2024-03-04 17:47:44 -05:00
aptalca	68f5cf8d9e	package moved to community repo	2024-03-04 17:11:41 -05:00
LinuxServer-CI	e8d452f4ce	Bot Updating Package Versions	2024-02-24 03:25:25 +00:00
LinuxServer-CI	4abd6c9890	Bot Updating Templated Files	2024-02-24 03:21:49 +00:00
LinuxServer-CI	c335faabdc	Bot Updating Templated Files	2024-02-24 03:18:57 +00:00
LinuxServer-CI	204dd90f9d	Bot Updating Package Versions	2024-02-17 03:20:23 +00:00
LinuxServer-CI	92bfbc19cd	Bot Updating Package Versions	2024-02-10 03:18:04 +00:00
LinuxServer-CI	cb3c74a6ee	Bot Updating Package Versions	2024-02-08 21:18:13 +00:00
LinuxServer-CI	b7f40863fe	Bot Updating Package Versions	2024-02-03 03:21:47 +00:00
LinuxServer-CI	ec6fca9418	Bot Updating Package Versions	2024-01-27 18:57:53 +00:00
Eric Nemchik	25a2832056	Merge pull request #441 from linuxserver/3.19 Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate	2024-01-27 12:52:12 -06:00
LinuxServer-CI	3eabd75388	Bot Updating Package Versions	2024-01-27 03:17:21 +00:00
Eric Nemchik	6ed17c1d52	Merge branch 'master' into 3.19	2024-01-23 20:27:06 -06:00
LinuxServer-CI	e568785908	Bot Updating Package Versions	2024-01-20 03:20:49 +00:00
LinuxServer-CI	bcee5182e6	Bot Updating Package Versions	2024-01-13 03:22:08 +00:00
LinuxServer-CI	514cf42606	Bot Updating Templated Files	2024-01-13 03:17:41 +00:00
LinuxServer-CI	270a0d57c9	Bot Updating Package Versions	2024-01-09 20:00:59 +00:00
LinuxServer-CI	6f51d8be26	Bot Updating Templated Files	2024-01-09 19:54:13 +00:00
LinuxServer-CI	d915d516cd	Bot Updating Templated Files	2024-01-09 19:47:00 +00:00
Eric Nemchik	ffb03a03f5	Merge pull request #425 from Peglah/dns_glesys Add GleSYS DNS plugin	2024-01-09 13:43:24 -06:00
Eric Nemchik	9693b5884f	Merge branch 'master' into dns_glesys	2024-01-09 13:28:15 -06:00
LinuxServer-CI	87ca95c8c2	Bot Updating Package Versions	2024-01-06 03:21:45 +00:00
Peglah	1a376a6975	rebased	2024-01-01 09:49:44 +01:00
Peglah	8e74593f2c	Rebase, Add GleSYS DNS plugin	2024-01-01 09:40:00 +01:00
LinuxServer-CI	00d1bce24d	Bot Updating Package Versions	2024-01-01 09:39:14 +01:00
LinuxServer-CI	be853fcb4b	Bot Updating Package Versions	2024-01-01 09:39:14 +01:00
LinuxServer-CI	2fb6c1f51f	Bot Updating Package Versions	2024-01-01 09:39:14 +01:00
LinuxServer-CI	9339d287d2	Bot Updating Package Versions	2024-01-01 09:39:14 +01:00
LinuxServer-CI	6b62a27bf0	Bot Updating Templated Files	2024-01-01 09:39:14 +01:00
Eric Nemchik	c50ca83ef9	Deprecate certbot-dns-dynu Signed-off-by: GitHub <noreply@github.com>	2024-01-01 09:39:10 +01:00
LinuxServer-CI	bd94a67024	Bot Updating Package Versions	2024-01-01 09:38:33 +01:00
LinuxServer-CI	11e060174b	Bot Updating Package Versions	2024-01-01 09:38:33 +01:00
driz	5f8a531a93	Update nginx-deny.conf	2024-01-01 09:38:33 +01:00
LinuxServer-CI	d2f843c4d1	Bot Updating Package Versions	2024-01-01 09:38:33 +01:00
LinuxServer-CI	ad6bb30bfc	Bot Updating Package Versions	2024-01-01 09:38:33 +01:00
LinuxServer-CI	11991aa0b3	Bot Updating Package Versions	2024-01-01 09:38:33 +01:00
LinuxServer-CI	c76e664965	Bot Updating Templated Files	2024-01-01 09:38:33 +01:00
Eric Nemchik	ccbd19fe62	Update readme-vars.yml	2024-01-01 09:38:29 +01:00
LinuxServer-CI	2573b79bad	Bot Updating Package Versions	2024-01-01 09:37:47 +01:00
LinuxServer-CI	0e5ba91588	Bot Updating Templated Files	2024-01-01 09:37:47 +01:00
Eric Nemchik	4f92460b29	Run certbot as root to allow fix http validation Fixes regression from https://github.com/linuxserver/docker-swag/pull/399 Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:37:39 +01:00
Eric Nemchik	ad1884e5b4	Fix index.php being downloaded on 404 Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:36:59 +01:00
LinuxServer-CI	70bea0a816	Bot Updating Package Versions	2024-01-01 09:23:16 +01:00
Eric Nemchik	85e44eb399	fix chown for group Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:23:16 +01:00
Eric Nemchik	4d3f30b67c	Move crontabs to etc Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:23:16 +01:00
Eric Nemchik	9da97969f8	Crontabs folder created in base Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:23:16 +01:00
Eric Nemchik	2cd84ad12b	cron in base Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:23:16 +01:00
Eric Nemchik	757ef31216	set owner of certbot folders to abc Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:23:16 +01:00
Eric Nemchik	767aad2286	Fix perms Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:23:16 +01:00
Eric Nemchik	4cb18bc106	standard cron Signed-off-by: Eric Nemchik <eric@nemchik.com>	2024-01-01 09:23:16 +01:00
LinuxServer-CI	b1cf98d214	Bot Updating Package Versions	2024-01-01 09:23:16 +01:00
LinuxServer-CI	48dfde26c7	Bot Updating Templated Files	2024-01-01 09:23:16 +01:00
LinuxServer-CI	320404d358	Bot Updating Package Versions	2024-01-01 09:23:16 +01:00
aptalca	52ae487bea	install mcrypt from community repo on alpine edge	2024-01-01 09:23:16 +01:00
LinuxServer-CI	65f62d14a6	Bot Updating Package Versions	2024-01-01 09:23:16 +01:00
LinuxServer-CI	accd20cc7a	Bot Updating Package Versions	2023-12-30 03:18:23 +00:00
Eric Nemchik	24b3540da5	Fix php83-pecl-mcrypt Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-12-23 16:18:56 -06:00
Eric Nemchik	bc31b51afb	Rebase to Alpine 3.19 with php 8.3, add root periodic crontabs for logrotate Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-12-23 16:12:03 -06:00
LinuxServer-CI	bf6ab14281	Bot Updating Package Versions	2023-12-23 03:17:49 +00:00
Peglah	278b57fb47	Add GleSYS DNS plugin	2023-11-08 12:42:43 +01:00