Bot Updating Templated Files

Bot Updating Package Versions
2026-02-22 20:30:31 +09:00 · 2025-01-31 18:37:58 +00:00 · 2025-01-31 18:36:28 +00:00 · 2025-01-24 18:37:18 +00:00 · 2025-01-22 19:53:46 +02:00 · 2025-01-22 14:53:01 +02:00
17 changed files with 999 additions and 713 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -6,7 +6,7 @@
 * Read, and fill the Pull Request template
  * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
  * If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
-* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
+* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://linuxserver.io/discord)

 ## Common files

@@ -105,10 +105,10 @@ docker build \
  -t linuxserver/heimdall:latest .
 ```

-The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`

 ```bash
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
+docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
 ```

 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
  - name: Discord chat support
-    url: https://discord.gg/YWrKVTn
+    url: https://linuxserver.io/discord
    about: Realtime support / chat with the community and the team.

  - name: Discourse discussion forum
--- 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 heimdall"
      label: Container logs
      placeholder: |
-        Output of `docker logs linuxserver.io`
+        Output of `docker logs heimdall`
      render: bash
    validations:
      required: true
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -7,22 +7,35 @@ 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'
+        env:
+          SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
        run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+          printf "# External trigger for docker-heimdall\n\n" >> $GITHUB_STEP_SUMMARY
+          if grep -q "^heimdall_master_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+            echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
+            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`heimdall_master_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
+          elif grep -q "^heimdall_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`heimdall_master\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
-          echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER\". ****"
-          echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER\`" >> $GITHUB_STEP_SUMMARY
-          echo "**** Retrieving external version ****"
+          echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
+          echo "> External trigger running off of master branch. To disable this trigger, add \`heimdall_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
+          printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
          EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" | jq -r '. | .tag_name')
+          echo "Type is \`github_stable\`" >> $GITHUB_STEP_SUMMARY
+          if grep -q "^heimdall_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            exit 0
+          fi
          if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
-            echo "**** Can't retrieve external version, exiting ****"
+            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
            FAILURE_REASON="Can't retrieve external version for heimdall branch master"
            GHA_TRIGGER_URL="https://github.com/linuxserver/docker-heimdall/actions/runs/${{ github.run_id }}"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
@@ -31,24 +44,42 @@ jobs:
            exit 1
          fi
          EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
-          echo "**** External version: ${EXT_RELEASE} ****"
-          echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
-          echo "**** Retrieving last pushed version ****"
+          echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
+          echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
          image="linuxserver/heimdall"
          tag="latest"
          token=$(curl -sX GET \
            "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fheimdall%3Apull" \
            | jq -r '.token')
-            multidigest=$(curl -s \
+          multidigest=$(curl -s \
+            --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+            --header "Accept: application/vnd.oci.image.index.v1+json" \
+            --header "Authorization: Bearer ${token}" \
+            "https://ghcr.io/v2/${image}/manifests/${tag}")
+          if jq -e '.layers // empty' <<< "${multidigest}" >/dev/null 2>&1; then
+            # If there's a layer element it's a single-arch manifest so just get that digest
+            digest=$(jq -r '.config.digest' <<< "${multidigest}")
+          else
+            # Otherwise it's multi-arch or has manifest annotations
+            if jq -e '.manifests[]?.annotations // empty' <<< "${multidigest}" >/dev/null 2>&1; then
+              # Check for manifest annotations and delete if found
+              multidigest=$(jq 'del(.manifests[] | select(.annotations))' <<< "${multidigest}")
+            fi
+            if [[ $(jq '.manifests | length' <<< "${multidigest}") -gt 1 ]]; then
+              # If there's still more than one digest, it's multi-arch
+              multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}")
+            else
+              # Otherwise it's single arch
+              multidigest=$(jq -r ".manifests[].digest?" <<< "${multidigest}")
+            fi
+            if digest=$(curl -s \
              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+              --header "Accept: application/vnd.oci.image.manifest.v1+json" \
              --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${tag}" \
-              | jq -r 'first(.manifests[].digest)')
-            digest=$(curl -s \
-              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-              --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${multidigest}" \
-              | jq -r '.config.digest')
+              "https://ghcr.io/v2/${image}/manifests/${multidigest}"); then
+              digest=$(jq -r '.config.digest' <<< "${digest}");
+            fi
+          fi
          image_info=$(curl -sL \
            --header "Authorization: Bearer ${token}" \
            "https://ghcr.io/v2/${image}/blobs/${digest}")
@@ -60,45 +91,54 @@ jobs:
          IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
          IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
          if [ -z "${IMAGE_VERSION}" ]; then
-            echo "**** Can't retrieve last pushed version, exiting ****"
+            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
            FAILURE_REASON="Can't retrieve last pushed version for heimdall tag latest"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
            exit 1
          fi
-          echo "**** Last pushed version: ${IMAGE_VERSION} ****"
-          echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY
+          echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY
          if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
-            echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
-            echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
+            echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
            exit 0
          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
-            echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
-            echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
+            echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
            exit 0
          else
-            echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
-            echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
-            response=$(curl -iX POST \
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/buildWithParameters?PACKAGE_CHECK=false \
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-            echo "**** Jenkins job queue url: ${response%$'\r'} ****"
-            echo "**** Sleeping 10 seconds until job starts ****"
-            sleep 10
-            buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-            buildurl="${buildurl%$'\r'}"
-            echo "**** Jenkins job build url: ${buildurl} ****"
-            echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
-            echo "**** Attempting to change the Jenkins job description ****"
-            curl -iX POST \
-              "${buildurl}submitDescription" \
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-              --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-              --data-urlencode "Submit=Submit"
-            echo "**** Notifying Discord ****"
-            TRIGGER_REASON="A version change was detected for heimdall tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            if [[ "${artifacts_found}" == "false" ]]; then
+              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+              echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
+              FAILURE_REASON="New version ${EXT_RELEASE} for heimdall tag latest is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
+              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+                "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
+                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            else
+              printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
+              echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
+              if [[ "${artifacts_found}" == "true" ]]; then
+                echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
+              fi
+              response=$(curl -iX POST \
+                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/buildWithParameters?PACKAGE_CHECK=false \
+                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+              echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
+              echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
+              sleep 10
+              buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+              buildurl="${buildurl%$'\r'}"
+              echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
+              echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
+              curl -iX POST \
+                "${buildurl}submitDescription" \
+                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+                --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+                --data-urlencode "Submit=Submit"
+              echo "**** Notifying Discord ****"
+              TRIGGER_REASON="A version change was detected for heimdall tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+                "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
+                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            fi
          fi
--- a/.github/workflows/external_trigger_scheduler.yml
+++ b/.github/workflows/external_trigger_scheduler.yml
@@ -9,37 +9,37 @@ 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'

      - name: External Trigger Scheduler
        run: |
-          echo "**** Branches found: ****"
-          git for-each-ref --format='%(refname:short)' refs/remotes
-          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
+          printf "# External trigger scheduler for docker-heimdall\n\n" >> $GITHUB_STEP_SUMMARY
+          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
+          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
          do
-            br=$(echo "$br" | sed 's|origin/||g')
-            echo "**** Evaluating branch ${br} ****"
+            if [[ "${br}" == "HEAD" ]]; then
+              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
+              continue
+            fi
+            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
            ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml)
            ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch')
            ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type')
            if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then
-              echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****"
+              echo "Branch appears to be live and trigger is not os; checking workflow." >> $GITHUB_STEP_SUMMARY
              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
-                echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
-                echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
+                echo "Triggering external trigger workflow for branch." >> $GITHUB_STEP_SUMMARY
                curl -iX POST \
                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
                  -H "Accept: application/vnd.github.v3+json" \
                  -d "{\"ref\":\"refs/heads/${br}\"}" \
                  https://api.github.com/repos/linuxserver/docker-heimdall/actions/workflows/external_trigger.yml/dispatches
              else
-                echo "**** Workflow doesn't exist; skipping trigger. ****"
-                echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
+                echo "Skipping branch due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
              fi
            else
-              echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****"
-              echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
+              echo "Skipping branch due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
            fi
          done
--- a/.github/workflows/package_trigger.yml
+++ b/.github/workflows/package_trigger.yml
@@ -1,42 +0,0 @@
-name: Package Trigger Main
-
-on:
-  workflow_dispatch:
-
-jobs:
-  package-trigger-master:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3.1.0
-
-      - name: Package Trigger
-        if: github.ref == 'refs/heads/master'
-        run: |
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
-          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
-            echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
-            echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
-          echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER\". ****"
-          echo "Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER\`" >> $GITHUB_STEP_SUMMARY
-          response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/buildWithParameters?PACKAGE_CHECK=true \
-            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-          echo "**** Jenkins job queue url: ${response%$'\r'} ****"
-          echo "**** Sleeping 10 seconds until job starts ****"
-          sleep 10
-          buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-          buildurl="${buildurl%$'\r'}"
-          echo "**** Jenkins job build url: ${buildurl} ****"
-          echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
-          echo "**** Attempting to change the Jenkins job description ****"
-          curl -iX POST \
-            "${buildurl}submitDescription" \
-            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-            --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-            --data-urlencode "Submit=Submit"
--- a/.github/workflows/package_trigger_scheduler.yml
+++ b/.github/workflows/package_trigger_scheduler.yml
@@ -9,42 +9,92 @@ 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'

      - name: Package Trigger Scheduler
+        env:
+          SKIP_PACKAGE_TRIGGER: ${{ vars.SKIP_PACKAGE_TRIGGER }}
        run: |
-          echo "**** Branches found: ****"
-          git for-each-ref --format='%(refname:short)' refs/remotes
-          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
+          printf "# Package trigger scheduler for docker-heimdall\n\n" >> $GITHUB_STEP_SUMMARY
+          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
+          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
          do
-            br=$(echo "$br" | sed 's|origin/||g')
-            echo "**** Evaluating branch ${br} ****"
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml | yq -r '.ls_branch')
-            if [ "${br}" == "${ls_branch}" ]; then
-              echo "**** Branch ${br} appears to be live; checking workflow. ****"
-              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
-                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
-                echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
-                triggered_branches="${triggered_branches}${br} "
-                curl -iX POST \
-                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
-                  -H "Accept: application/vnd.github.v3+json" \
-                  -d "{\"ref\":\"refs/heads/${br}\"}" \
-                  https://api.github.com/repos/linuxserver/docker-heimdall/actions/workflows/package_trigger.yml/dispatches
-                sleep 30
+            if [[ "${br}" == "HEAD" ]]; then
+              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
+              continue
+            fi
+            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
+            JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml)
+            if ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/Jenkinsfile >/dev/null 2>&1; then
+              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+              echo "> No Jenkinsfile found. Branch is either deprecated or is an early dev branch." >> $GITHUB_STEP_SUMMARY
+              skipped_branches="${skipped_branches}${br} "
+            elif [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
+              echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
+              README_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/readme-vars.yml)
+              if [[ $(yq -r '.project_deprecation_status' <<< "${README_VARS}") == "true" ]]; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> Branch appears to be deprecated; skipping trigger." >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
+              elif [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
+              elif grep -q "^heimdall_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`heimdall_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
+              elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/${br}/lastBuild/api/json | jq -r '.building' 2>/dev/null) == "true" ]; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
              else
-                echo "**** Workflow doesn't exist; skipping trigger. ****"
-                echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
+                echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
+                echo "> Triggering package trigger for branch ${br}" >> $GITHUB_STEP_SUMMARY
+                printf "> To disable, add \`heimdall_%s\` into the Github organizational variable \`SKIP_PACKAGE_TRIGGER\`.\n\n" "${br}" >> $GITHUB_STEP_SUMMARY
+                triggered_branches="${triggered_branches}${br} "
+                response=$(curl -iX POST \
+                  https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/${br}/buildWithParameters?PACKAGE_CHECK=true \
+                  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+                if [[ -z "${response}" ]]; then
+                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                  echo "> Jenkins build could not be triggered. Skipping branch."
+                  continue
+                fi
+                echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
+                echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
+                sleep 10
+                buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+                buildurl="${buildurl%$'\r'}"
+                echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
+                echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
+                if ! curl -ifX POST \
+                  "${buildurl}submitDescription" \
+                  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+                  --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+                  --data-urlencode "Submit=Submit"; then
+                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                  echo "> Unable to change the Jenkins job description."
+                fi
+                sleep 20
              fi
            else
-              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
              echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
            fi
          done
-          echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
-          echo "**** Notifying Discord ****"
-          curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-            "description": "**Package Check Build(s) Triggered for heimdall** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-heimdall/activity/"' \n"}],
-            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+          if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
+            if [[ -n "${triggered_branches}" ]]; then
+              NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
+              NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-heimdall/activity/ \n"
+              echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
+            fi
+            if [[ -n "${skipped_branches}" ]]; then
+              NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
+            fi
+            echo "**** Notifying Discord ****"
+            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              "description": "**Package Check Build(s) for heimdall** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}],
+              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+          fi
--- 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/21
+++ b/21
@@ -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
@@ -9,22 +9,24 @@ ARG HEIMDALL_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="aptalca"

-# environment settings
-ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
-
 RUN \
  echo "**** install runtime packages ****" && \
  apk add --no-cache \
-    php82-intl \
-    php82-pdo_pgsql \
-    php82-pdo_sqlite \
-    php82-pdo_mysql \
-    php82-tokenizer && \
+    php83-dom \
+    php83-intl \
+    php83-pdo_pgsql \
+    php83-pdo_sqlite \
+    php83-pdo_mysql \
+    php83-opcache \
+    php83-tokenizer && \
  echo "**** configure nginx ****" && \
  echo 'fastcgi_param  PHP_AUTH_USER      $remote_user; # Heimdall user authorization' >> \
    /etc/nginx/fastcgi_params && \
  echo 'fastcgi_param  PHP_AUTH_PW        $http_authorization; # Heimdall user authorization' >> \
    /etc/nginx/fastcgi_params && \
+  echo "**** configure php opcache ****" && \
+  echo 'opcache.validate_timestamps=0' >> \
+    /etc/php83/conf.d/00_opcache.ini && \
  echo "**** install heimdall ****" && \
  mkdir -p \
    /heimdall && \
@@ -40,6 +42,7 @@ RUN \
  tar xf \
    /tmp/heimdall.tar.gz -C \
    /app/www-tmp --strip-components=1 && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
  echo "**** cleanup ****" && \
  rm -rf \
    /tmp/*
--- 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
@@ -9,22 +9,24 @@ ARG HEIMDALL_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="aptalca"

-# environment settings
-ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
-
 RUN \
  echo "**** install runtime packages ****" && \
  apk add --no-cache \
-    php82-intl \
-    php82-pdo_pgsql \
-    php82-pdo_sqlite \
-    php82-pdo_mysql \
-    php82-tokenizer && \
+    php83-dom \
+    php83-intl \
+    php83-pdo_pgsql \
+    php83-pdo_sqlite \
+    php83-pdo_mysql \
+    php83-opcache \
+    php83-tokenizer && \
  echo "**** configure nginx ****" && \
  echo 'fastcgi_param  PHP_AUTH_USER      $remote_user; # Heimdall user authorization' >> \
    /etc/nginx/fastcgi_params && \
  echo 'fastcgi_param  PHP_AUTH_PW        $http_authorization; # Heimdall user authorization' >> \
    /etc/nginx/fastcgi_params && \
+  echo "**** configure php opcache ****" && \
+  echo 'opcache.validate_timestamps=0' >> \
+    /etc/php83/conf.d/00_opcache.ini && \
  echo "**** install heimdall ****" && \
  mkdir -p \
    /heimdall && \
@@ -40,6 +42,7 @@ RUN \
  tar xf \
    /tmp/heimdall.tar.gz -C \
    /app/www-tmp --strip-components=1 && \
+  printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
  echo "**** cleanup ****" && \
  rm -rf \
    /tmp/*
--- a/629
+++ b/629
@@ -8,7 +8,7 @@ pipeline {
  }
  // Input to determine if this is a package check
  parameters {
-     string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK')
+    string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK')
  }
  // Configuration for the variables used for this specific repo
  environment {
@@ -16,6 +16,9 @@ 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')
+    QUAYIO_API_TOKEN=credentials('quayio-repo-api-token')
+    GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f')
    EXT_GIT_BRANCH = '2.x'
    EXT_USER = 'linuxserver'
    EXT_REPO = 'Heimdall'
@@ -33,20 +36,44 @@ pipeline {
    CI_PORT='80'
    CI_SSL='false'
    CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
-    CI_AUTH='user:password'
+    CI_DOCKERENV=''
+    CI_AUTH=''
    CI_WEBPATH=''
  }
  stages {
+    stage("Set git config"){
+      steps{
+        sh '''#!/bin/bash
+              cat ${GIT_SIGNING_KEY} > /config/.ssh/id_sign
+              chmod 600 /config/.ssh/id_sign
+              ssh-keygen -y -f /config/.ssh/id_sign > /config/.ssh/id_sign.pub
+              echo "Using $(ssh-keygen -lf /config/.ssh/id_sign) to sign commits"
+              git config --global gpg.format ssh
+              git config --global user.signingkey /config/.ssh/id_sign
+              git config --global commit.gpgsign true
+        '''
+      }
+    }
    // Setup all the basic environment variables needed for the build
    stage("Set ENV Variables base"){
      steps{
+        echo "Running on node: ${NODE_NAME}"
        sh '''#! /bin/bash
-              containers=$(docker ps -aq)
+              echo "Pruning builder"
+              docker builder prune -f --builder container || :
+              containers=$(docker ps -q)
              if [[ -n "${containers}" ]]; then
-                docker stop ${containers}
+                BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
+                for container in ${containers}; do
+                  if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
+                    echo "skipping buildx container in docker stop"
+                  else
+                    echo "Stopping container ${container}"
+                    docker stop ${container}
+                  fi
+                done
              fi
-              docker system prune -af --volumes || : '''
+              docker system prune -f --volumes || : '''
        script{
          env.EXIT_STATUS = ''
          env.LS_RELEASE = sh(
@@ -61,11 +88,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'
+          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'
        }
+        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' ''',
@@ -130,7 +162,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+)/
@@ -148,7 +180,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}")
@@ -179,6 +211,7 @@ pipeline {
          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
        }
      }
    }
@@ -203,6 +236,7 @@ pipeline {
          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
+          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
        }
      }
    }
@@ -227,6 +261,7 @@ pipeline {
          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
+          env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
        }
      }
    }
@@ -249,9 +284,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" || :'''
        }
      }
@@ -270,8 +307,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}
@@ -280,16 +324,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 .github/workflows/package_trigger.yml"
              for i in ${OLD_TEMPLATES}; do
                if [[ -f "${i}" ]]; then
                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -304,15 +349,45 @@ 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 2.5 - Update init diagram"
+              if ! grep -q 'init_diagram:' readme-vars.yml; then
+                echo "Adding the key 'init_diagram' to readme-vars.yml"
+                sed -i '\\|^#.*changelog.*$|d' readme-vars.yml
+                sed -i 's|^changelogs:|# init diagram\\ninit_diagram:\\n\\n# changelog\\nchangelogs:|' readme-vars.yml
+              fi
+              mkdir -p ${TEMPDIR}/d2
+              docker run --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) -e RAW="true" ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:latest
+              ls -al ${TEMPDIR}/d2
+              yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-latest.d2\\")" readme-vars.yml
+              if [[ $(md5sum readme-vars.yml | cut -c1-8) != $(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml | cut -c1-8) ]]; then
+                echo "'init_diagram' has been updated. Updating repo and exiting build, new one will trigger based on commit."
+                mkdir -p ${TEMPDIR}/repo
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                cd ${TEMPDIR}/repo/${LS_REPO}
+                git checkout -f master
+                cp ${WORKSPACE}/readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/readme-vars.yml
+                git add readme-vars.yml
+                git commit -m 'Bot Updating Templated Files'
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Updating templates and exiting build, new one will trigger based on commit"
+                rm -Rf ${TEMPDIR}
+                exit 0
+              else
+                echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Init diagram is unchanged"
+              fi
+              echo "Starting Stage 3 - Update templates"
              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
@@ -333,31 +408,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
@@ -368,7 +462,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{
@@ -415,23 +544,27 @@ pipeline {
      }
    }
    /* #######################
-           GitLab Mirroring
+       GitLab Mirroring and Quay.io Repo Visibility
       ####################### */
-    // Ping into Gitlab to mirror this repo and have a registry endpoint
-    stage("GitLab Mirror"){
+    // Ping into Gitlab to mirror this repo and have a registry endpoint & mark this repo on Quay.io as public
+    stage("GitLab Mirror and Quay.io Visibility"){
      when {
        environment name: 'EXIT_STATUS', value: ''
      }
      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" '''
+        sh '''curl -H "Content-Type: application/json" -H "Authorization: Bearer ${QUAYIO_API_TOKEN}" -X POST "https://quay.io/api/v1/repository${QUAYIMAGE/quay.io/}/changevisibility" \
+          -d '{"visibility":"public"}' ||: '''
      } 
    }
    /* ###############
@@ -462,7 +595,42 @@ pipeline {
          --label \"org.opencontainers.image.title=Heimdall\" \
          --label \"org.opencontainers.image.description=[Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way.    Simplicity is the key to Heimdall.    Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.  \" \
          --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
+          --provenance=true --sbom=true --builder=container --load \
          --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+        sh '''#! /bin/bash
+              set -e
+              IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+              for i in "${CACHE[@]}"; do
+                docker tag ${IMAGE}:${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+              done
+           '''
+        withCredentials([
+          [
+            $class: 'UsernamePasswordMultiBinding',
+            credentialsId: 'Quay.io-Robot',
+            usernameVariable: 'QUAYUSER',
+            passwordVariable: 'QUAYPASS'
+          ]
+        ]) {
+          retry_backoff(5,5) {
+              sh '''#! /bin/bash
+                    set -e
+                    echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
+                    echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                    echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                    echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                    if [[ "${PACKAGE_CHECK}" != "true" ]]; then
+                      IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                      for i in "${CACHE[@]}"; do
+                        docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
+                      done
+                      for p in $(jobs -p); do
+                        wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                      done
+                    fi
+                '''
+          }
+        }
      }
    }
    // Build MultiArch Docker containers for push to LS Repo
@@ -493,7 +661,42 @@ pipeline {
              --label \"org.opencontainers.image.title=Heimdall\" \
              --label \"org.opencontainers.image.description=[Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way.    Simplicity is the key to Heimdall.    Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.  \" \
              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
+              --provenance=true --sbom=true --builder=container --load \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
+            sh '''#! /bin/bash
+                  set -e
+                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                  for i in "${CACHE[@]}"; do
+                    docker tag ${IMAGE}:amd64-${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                  done
+               '''
+            withCredentials([
+              [
+                $class: 'UsernamePasswordMultiBinding',
+                credentialsId: 'Quay.io-Robot',
+                usernameVariable: 'QUAYUSER',
+                passwordVariable: 'QUAYPASS'
+              ]
+            ]) {
+              retry_backoff(5,5) {
+                  sh '''#! /bin/bash
+                        set -e
+                        echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
+                        echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                        echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                        echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                        if [[ "${PACKAGE_CHECK}" != "true" ]]; then
+                          IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                          for i in "${CACHE[@]}"; do
+                            docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
+                          done
+                          for p in $(jobs -p); do
+                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                          done
+                        fi
+                    '''
+              }
+            }
          }
        }
        stage('Build ARM64') {
@@ -502,10 +705,6 @@ pipeline {
          }
          steps {
            echo "Running on node: ${NODE_NAME}"
-            echo 'Logging into Github'
-            sh '''#! /bin/bash
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-               '''
            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64"
            sh "docker buildx build \
              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
@@ -521,17 +720,49 @@ pipeline {
              --label \"org.opencontainers.image.title=Heimdall\" \
              --label \"org.opencontainers.image.description=[Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way.    Simplicity is the key to Heimdall.    Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.  \" \
              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
+              --provenance=true --sbom=true --builder=container --load \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-            sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-            retry(5) {
-              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
+            sh '''#! /bin/bash
+                  set -e
+                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                  for i in "${CACHE[@]}"; do
+                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  done
+               '''
+            withCredentials([
+              [
+                $class: 'UsernamePasswordMultiBinding',
+                credentialsId: 'Quay.io-Robot',
+                usernameVariable: 'QUAYUSER',
+                passwordVariable: 'QUAYPASS'
+              ]
+            ]) {
+              retry_backoff(5,5) {
+                  sh '''#! /bin/bash
+                        set -e
+                        echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
+                        echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
+                        echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
+                        echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+                        if [[ "${PACKAGE_CHECK}" != "true" ]]; then
+                          IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                          for i in "${CACHE[@]}"; do
+                            docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
+                          done
+                          for p in $(jobs -p); do
+                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                          done
+                        fi
+                    '''
+              }
            }
            sh '''#! /bin/bash
                  containers=$(docker ps -aq)
                  if [[ -n "${containers}" ]]; then
                    docker stop ${containers}
                  fi
-                  docker system prune -af --volumes || : '''
+                  docker system prune -af --volumes || :
+               '''
          }
        }
      }
@@ -547,7 +778,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}
@@ -568,7 +799,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
@@ -634,18 +866,27 @@ pipeline {
          }
          sh '''#! /bin/bash
                set -e
+                if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then
+                  echo "Detected baseimage, setting LSIO_FIRST_PARTY=true"
+                  if [ -n "${CI_DOCKERENV}" ]; then
+                    CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}"
+                  else
+                    CI_DOCKERENV="LSIO_FIRST_PARTY=true"
+                  fi
+                fi
                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 RELEASE_TAG=\"latest\" \
                -e PORT=\"${CI_PORT}\" \
                -e SSL=\"${CI_SSL}\" \
                -e BASE=\"${DIST_IMAGE}\" \
@@ -655,6 +896,7 @@ pipeline {
                -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                -e WEB_AUTH=\"${CI_AUTH}\" \
                -e WEB_PATH=\"${CI_WEBPATH}\" \
+                -e NODE_NAME=\"${NODE_NAME}\" \
                -t ghcr.io/linuxserver/ci:latest \
                python3 test_build.py'''
        }
@@ -670,43 +912,23 @@ pipeline {
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'Quay.io-Robot',
-            usernameVariable: 'QUAYUSER',
-            passwordVariable: 'QUAYPASS'
-          ]
-        ]) {
-          retry(5) {
-            sh '''#! /bin/bash
-                  set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
-                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
-                    fi
-                    docker push ${PUSHIMAGE}:latest
-                    docker push ${PUSHIMAGE}:${META_TAG}
-                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                     docker push ${PUSHIMAGE}:${SEMVER}
-                    fi
+        retry_backoff(5,5) {
+          sh '''#! /bin/bash
+                set -e
+                for PUSHIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                  [[ ${PUSHIMAGE%%/*} =~ \\. ]] && PUSHIMAGEPLUS="${PUSHIMAGE}" || PUSHIMAGEPLUS="docker.io/${PUSHIMAGE}"
+                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                  for i in "${CACHE[@]}"; do
+                      if [[ "${PUSHIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
+                          CACHEIMAGE=${i}
+                      fi
                  done
-               '''
-          }
+                  docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                  if [ -n "${SEMVER}" ]; then
+                    docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                  fi
+                done
+              '''
        }
      }
    }
@@ -717,85 +939,34 @@ pipeline {
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'Quay.io-Robot',
-            usernameVariable: 'QUAYUSER',
-            passwordVariable: 'QUAYPASS'
-          ]
-        ]) {
-          retry(5) {
-            sh '''#! /bin/bash
-                  set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --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 tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
-                  fi
-                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                    docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                      docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                    fi
-                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-latest
-                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm64v8-latest
-                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                    fi
-                    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
-                    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} 
-                    fi
+        retry_backoff(5,5) {
+          sh '''#! /bin/bash
+                set -e
+                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                  [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}"
+                  IFS=',' read -ra CACHE <<< "$BUILDCACHE"
+                  for i in "${CACHE[@]}"; do
+                      if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then
+                          CACHEIMAGE=${i}
+                      fi
                  done
-               '''
-          }
+                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  if [ -n "${SEMVER}" ]; then
+                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                  fi
+                done
+                for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                  if [ -n "${SEMVER}" ]; then
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                  fi
+                done
+              '''
        }
      }
    }
@@ -816,14 +987,14 @@ pipeline {
             "object": "'${COMMIT_SHA}'",\
             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
             "type": "commit",\
-             "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
+             "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
        echo "Pushing New release for Tag"
        sh '''#! /bin/bash
              curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
              echo '{"tag_name":"'${META_TAG}'",\
                     "target_commitish": "master",\
                     "name": "'${META_TAG}'",\
-                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
+                     "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
              printf '","draft": false,"prerelease": false}' >> releasebody.json
              paste -d'\\0' start releasebody.json > releasebody.json.done
              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
@@ -864,39 +1035,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 {
@@ -981,32 +1119,93 @@ EOF
     ###################### */
  post {
    always {
+      sh '''#!/bin/bash
+            rm -rf /config/.ssh/id_sign
+            rm -rf /config/.ssh/id_sign.pub
+            git config --global --unset gpg.format
+            git config --global --unset user.signingkey
+            git config --global --unset commit.gpgsign
+        '''
      script{
+        env.JOB_DATE = sh(
+            script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''',
+            returnStdout: true).trim()
        if (env.EXIT_STATUS == "ABORTED"){
          sh 'echo "build aborted"'
-        }
-        else if (currentBuild.currentResult == "SUCCESS"){
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\
-                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
-                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
-        }
-        else {
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
-                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
+        }else{
+          if (currentBuild.currentResult == "SUCCESS"){
+            if (env.GITHUBIMAGE =~ /lspipepr/){
+              env.JOB_WEBHOOK_STATUS='Success'
+              env.JOB_WEBHOOK_COLOUR=3957028
+              env.JOB_WEBHOOK_FOOTER='PR Build'
+            }else if (env.GITHUBIMAGE =~ /lsiodev/){
+              env.JOB_WEBHOOK_STATUS='Success'
+              env.JOB_WEBHOOK_COLOUR=3957028
+              env.JOB_WEBHOOK_FOOTER='Dev Build'
+            }else{
+              env.JOB_WEBHOOK_STATUS='Success'
+              env.JOB_WEBHOOK_COLOUR=1681177
+              env.JOB_WEBHOOK_FOOTER='Live Build'
+            }
+          }else{
+            if (env.GITHUBIMAGE =~ /lspipepr/){
+              env.JOB_WEBHOOK_STATUS='Failure'
+              env.JOB_WEBHOOK_COLOUR=12669523
+              env.JOB_WEBHOOK_FOOTER='PR Build'
+            }else if (env.GITHUBIMAGE =~ /lsiodev/){
+              env.JOB_WEBHOOK_STATUS='Failure'
+              env.JOB_WEBHOOK_COLOUR=12669523
+              env.JOB_WEBHOOK_FOOTER='Dev Build'
+            }else{
+              env.JOB_WEBHOOK_STATUS='Failure'
+              env.JOB_WEBHOOK_COLOUR=16711680
+              env.JOB_WEBHOOK_FOOTER='Live Build'
+            }
+          }
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"'color'": '${JOB_WEBHOOK_COLOUR}',\
+                 "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\
+                 "timestamp": "'${JOB_DATE}'",\
+                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  '${JOB_WEBHOOK_STATUS}'\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
        }
      }
    }
    cleanup {
      sh '''#! /bin/bash
-            echo "Performing docker system prune!!"
-            containers=$(docker ps -aq)
+            echo "Pruning builder!!"
+            docker builder prune -f --builder container || :
+            containers=$(docker ps -q)
            if [[ -n "${containers}" ]]; then
-              docker stop ${containers}
+              BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
+              for container in ${containers}; do
+                if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
+                  echo "skipping buildx container in docker stop"
+                else
+                  echo "Stopping container ${container}"
+                  docker stop ${container}
+                fi
+              done
            fi
-            docker system prune -af --volumes || :
+            docker system prune -f --volumes || :
         '''
      cleanWs()
    }
  }
 }
+
+def retry_backoff(int max_attempts, int power_base, Closure c) {
+  int n = 0
+  while (n < max_attempts) {
+    try {
+      c()
+      return
+    } catch (err) {
+      if ((n + 1) >= max_attempts) {
+        throw err
+      }
+      sleep(power_base ** n)
+      n++
+    }
+  }
+  return
+}
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)

 [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
-[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
+[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://linuxserver.io/discord "realtime support / chat with the community and the team.")
 [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.")
 [![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
 [![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.")
@@ -20,7 +20,7 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r
 Find us at:

 * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
-* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
+* [Discord](https://linuxserver.io/discord) - realtime support / chat with the community and the team.
 * [Discourse](https://discourse.linuxserver.io) - post on our community forum.
 * [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images.
 * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
@@ -28,7 +28,7 @@ Find us at:

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

-[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fheimdall?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fheimdall)
+[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fheimdall?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-heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-heimdall)
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-heimdall/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-heimdall/packages)
@@ -74,7 +74,6 @@ This image provides various versions that are available via tags. Please read th

 Access the web gui at http://SERVERIP:PORT

-
 ### Adding password protection

 This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd <username>`. Replace <username> with a username of your choice and you will be asked to enter a password. Uncomment the `basic auth` lines in `/config/nginx/site-confs/default.conf` and restart the container.
@@ -83,11 +82,13 @@ This image now supports password protection through htpasswd. Run the following

 To help you get started creating a container from this image you can either use docker-compose or the docker cli.

+>[!NOTE]
+>Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided.
+
 ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))

 ```yaml
 ---
-version: "2.1"
 services:
  heimdall:
    image: lscr.io/linuxserver/heimdall:latest
@@ -97,7 +98,7 @@ services:
      - PGID=1000
      - TZ=Etc/UTC
    volumes:
-      - /path/to/appdata/config:/config
+      - /path/to/heimdall/config:/config
    ports:
      - 80:80
      - 443:443
@@ -114,7 +115,7 @@ docker run -d \
  -e TZ=Etc/UTC \
  -p 80:80 \
  -p 443:443 \
-  -v /path/to/appdata/config:/config \
+  -v /path/to/heimdall/config:/config \
  --restart unless-stopped \
  lscr.io/linuxserver/heimdall:latest
 ```
@@ -125,12 +126,12 @@ Containers are configured using parameters passed at runtime (such as those abov

 | Parameter | Function |
 | :----: | --- |
-| `-p 80` | http gui |
-| `-p 443` | https gui |
+| `-p 80:80` | http gui |
+| `-p 443:443` | https gui |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
-| `-v /config` | Contains all relevant configuration files. |
+| `-v /config` | Persistent config files |

 ## Environment variables from files (Docker secrets)

@@ -201,7 +202,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:

@@ -266,24 +267,10 @@ 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 heimdall
-    ```
-
-* 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.
+>[!TIP]
+>We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.

 ## Building locally

@@ -298,16 +285,20 @@ docker build \
  -t lscr.io/linuxserver/heimdall:latest .
 ```

-The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`

 ```bash
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
+docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
 ```

 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.

 ## Versions

+* **27.06.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings.
+* **07.03.24:** - Enable the opcache and disable file revalidation.
+* **06.03.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf.
+* **23.12.23:** - Rebase to Alpine 3.19 with php 8.3.
 * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
 * **13.04.23:** - Move ssl.conf include to default.conf.
 * **20.01.23:** - Rebase to alpine 3.17 with php8.1.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -6,7 +6,6 @@ external_type: github_stable
 release_type: stable
 release_tag: latest
 ls_branch: master
-build_armhf: false
 repo_vars:
  - EXT_GIT_BRANCH = '2.x'
  - EXT_USER = 'linuxserver'
@@ -25,6 +24,6 @@ repo_vars:
  - CI_PORT='80'
  - CI_SSL='false'
  - CI_DELAY='120'
-  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH='user:password'
+  - CI_DOCKERENV=''
+  - CI_AUTH=''
  - CI_WEBPATH=''
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,228 +1,252 @@
-NAME                                                                 VERSION                 TYPE         
-Readsfromstdinwithoutleakinginfototheterminalandoutputsbacktostdout  1,                      dotnet        
-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           
-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           
-barryvdh/laravel-ide-helper                                          v2.12.3                 php-composer  
-barryvdh/reflection-docblock                                         v2.1.0                  php-composer  
-bash                                                                 5.2.15-r5               apk           
-brick/math                                                           0.9.3                   php-composer  
-brotli-libs                                                          1.0.9-r14               apk           
-busybox                                                              1.36.1-r5               apk           
-busybox-binsh                                                        1.36.1-r5               apk           
-ca-certificates                                                      20230506-r0             apk           
-ca-certificates-bundle                                               20230506-r0             apk           
-clue/stream-filter                                                   v1.6.0                  php-composer  
-composer/pcre                                                        3.1.0                   php-composer  
-coreutils                                                            9.3-r1                  apk           
-curl                                                                 8.5.0-r0                apk           
-dflydev/dot-access-data                                              v3.0.2                  php-composer  
-doctrine/cache                                                       2.2.0                   php-composer  
-doctrine/dbal                                                        3.5.1                   php-composer  
-doctrine/deprecations                                                v1.0.0                  php-composer  
-doctrine/event-manager                                               1.2.0                   php-composer  
-doctrine/inflector                                                   2.0.6                   php-composer  
-doctrine/instantiator                                                1.4.1                   php-composer  
-doctrine/lexer                                                       1.2.3                   php-composer  
-dragonmantank/cron-expression                                        v3.3.2                  php-composer  
-egulias/email-validator                                              2.1.25                  php-composer  
-facade/flare-client-php                                              1.10.0                  php-composer  
-facade/ignition                                                      2.17.6                  php-composer  
-facade/ignition-contracts                                            1.0.2                   php-composer  
-fideloper/proxy                                                      4.4.2                   php-composer  
-filp/whoops                                                          2.14.6                  php-composer  
-fzaninotto/faker                                                     v1.9.2                  php-composer  
-git                                                                  2.40.1-r0               apk           
-graham-campbell/bounded-cache                                        v1.3.0                  php-composer  
-graham-campbell/github                                               v10.6.0                 php-composer  
-graham-campbell/manager                                              v4.7.0                  php-composer  
-graham-campbell/result-type                                          v1.1.0                  php-composer  
-guzzlehttp/guzzle                                                    7.5.0                   php-composer  
-guzzlehttp/promises                                                  1.5.2                   php-composer  
-guzzlehttp/psr7                                                      2.4.3                   php-composer  
-hamcrest/hamcrest-php                                                v2.0.1                  php-composer  
-icu-data-en                                                          73.2-r2                 apk           
-icu-libs                                                             73.2-r2                 apk           
-jq                                                                   1.6-r4                  apk           
-knplabs/github-api                                                   v3.6.0                  php-composer  
-laravel/framework                                                    v8.83.26                php-composer  
-laravel/serializable-closure                                         v1.2.2                  php-composer  
-laravel/tinker                                                       v2.7.3                  php-composer  
-laravel/ui                                                           v3.4.6                  php-composer  
-laravelcollective/html                                               v6.3.0                  php-composer  
-league/commonmark                                                    2.3.7                   php-composer  
-league/config                                                        v1.1.1                  php-composer  
-league/flysystem                                                     1.1.10                  php-composer  
-league/mime-type-detection                                           1.11.0                  php-composer  
-libacl                                                               2.3.1-r3                apk           
-libattr                                                              2.5.1-r4                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           
-libedit                                                              20221030.3.1-r1         apk           
-libexpat                                                             2.5.0-r1                apk           
-libgcc                                                               12.2.1_git20220924-r10  apk           
-libidn2                                                              2.3.4-r1                apk           
-libintl                                                              0.21.1-r7               apk           
-libmd                                                                1.0.4-r2                apk           
-libncursesw                                                          6.4_p20230506-r0        apk           
-libpq                                                                15.5-r0                 apk           
-libproc2                                                             4.0.4-r0                apk           
-libssl3                                                              3.1.4-r1                apk           
-libstdc++                                                            12.2.1_git20220924-r10  apk           
-libunistring                                                         1.1-r1                  apk           
-libuuid                                                              2.38.1-r8               apk           
-libxml2                                                              2.11.6-r0               apk           
-libzip                                                               1.9.2-r2                apk           
-linux-pam                                                            1.5.2-r10               apk           
-logrotate                                                            3.21.0-r1               apk           
-mockery/mockery                                                      1.5.1                   php-composer  
-monolog/monolog                                                      2.8.0                   php-composer  
-musl                                                                 1.2.4-r2                apk           
-musl-utils                                                           1.2.4-r2                apk           
-myclabs/deep-copy                                                    1.11.0                  php-composer  
-nano                                                                 7.2-r1                  apk           
-ncurses-terminfo-base                                                6.4_p20230506-r0        apk           
-nesbot/carbon                                                        2.63.0                  php-composer  
-netcat-openbsd                                                       1.219-r1                apk           
-nette/schema                                                         v1.2.3                  php-composer  
-nette/utils                                                          v3.2.8                  php-composer  
-nghttp2-libs                                                         1.57.0-r0               apk           
-nginx                                                                1.24.0-r7               apk           
-nikic/php-parser                                                     v4.15.2                 php-composer  
-nunomaduro/collision                                                 v5.11.0                 php-composer  
-oniguruma                                                            6.9.8-r1                apk           
-openssl                                                              3.1.4-r1                apk           
-opis/closure                                                         3.6.3                   php-composer  
-pcre                                                                 8.45-r3                 apk           
-pcre2                                                                10.42-r1                apk           
-phar-io/manifest                                                     2.0.3                   php-composer  
-phar-io/version                                                      3.2.1                   php-composer  
-php-http/cache-plugin                                                1.7.5                   php-composer  
-php-http/client-common                                               2.6.0                   php-composer  
-php-http/discovery                                                   1.14.3                  php-composer  
-php-http/httplug                                                     2.3.0                   php-composer  
-php-http/message                                                     1.13.0                  php-composer  
-php-http/message-factory                                             v1.0.2                  php-composer  
-php-http/multipart-stream-builder                                    1.2.0                   php-composer  
-php-http/promise                                                     1.1.0                   php-composer  
-php82                                                                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-fileinfo                                                       8.2.13-r0               apk           
-php82-fpm                                                            8.2.13-r0               apk           
-php82-iconv                                                          8.2.13-r0               apk           
-php82-intl                                                           8.2.13-r0               apk           
-php82-mbstring                                                       8.2.13-r0               apk           
-php82-mysqlnd                                                        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_pgsql                                                      8.2.13-r0               apk           
-php82-pdo_sqlite                                                     8.2.13-r0               apk           
-php82-phar                                                           8.2.13-r0               apk           
-php82-session                                                        8.2.13-r0               apk           
-php82-simplexml                                                      8.2.13-r0               apk           
-php82-tokenizer                                                      8.2.13-r0               apk           
-php82-xml                                                            8.2.13-r0               apk           
-php82-xmlwriter                                                      8.2.13-r0               apk           
-php82-zip                                                            8.2.13-r0               apk           
-phpdocumentor/reflection-common                                      2.2.0                   php-composer  
-phpdocumentor/type-resolver                                          1.6.2                   php-composer  
-phpoption/phpoption                                                  1.9.0                   php-composer  
-phpunit/php-code-coverage                                            9.2.19                  php-composer  
-phpunit/php-file-iterator                                            3.0.6                   php-composer  
-phpunit/php-invoker                                                  3.1.1                   php-composer  
-phpunit/php-text-template                                            2.0.4                   php-composer  
-phpunit/php-timer                                                    5.0.3                   php-composer  
-phpunit/phpunit                                                      9.5.26                  php-composer  
-popt                                                                 1.19-r2                 apk           
-procps-ng                                                            4.0.4-r0                apk           
-psr/cache                                                            1.0.1                   php-composer  
-psr/container                                                        1.1.2                   php-composer  
-psr/event-dispatcher                                                 1.0.0                   php-composer  
-psr/http-client                                                      1.0.1                   php-composer  
-psr/http-factory                                                     1.0.1                   php-composer  
-psr/http-message                                                     1.0.1                   php-composer  
-psr/log                                                              1.1.4                   php-composer  
-psr/simple-cache                                                     1.0.1                   php-composer  
-psy/psysh                                                            v0.11.9                 php-composer  
-ralouphie/getallheaders                                              3.0.3                   php-composer  
-ramsey/collection                                                    1.2.2                   php-composer  
-ramsey/uuid                                                          4.2.3                   php-composer  
-readline                                                             8.2.1-r1                apk           
-scanelf                                                              1.3.7-r1                apk           
-sebastian/cli-parser                                                 1.0.1                   php-composer  
-sebastian/code-unit                                                  1.0.8                   php-composer  
-sebastian/code-unit-reverse-lookup                                   2.0.3                   php-composer  
-sebastian/comparator                                                 4.0.8                   php-composer  
-sebastian/complexity                                                 2.0.2                   php-composer  
-sebastian/diff                                                       4.0.4                   php-composer  
-sebastian/environment                                                5.1.4                   php-composer  
-sebastian/exporter                                                   4.0.5                   php-composer  
-sebastian/global-state                                               5.0.5                   php-composer  
-sebastian/lines-of-code                                              1.0.3                   php-composer  
-sebastian/object-enumerator                                          4.0.4                   php-composer  
-sebastian/object-reflector                                           2.0.4                   php-composer  
-sebastian/recursion-context                                          4.0.4                   php-composer  
-sebastian/resource-operations                                        3.0.3                   php-composer  
-sebastian/type                                                       3.2.0                   php-composer  
-sebastian/version                                                    3.0.2                   php-composer  
-shadow                                                               4.13-r4                 apk           
-skalibs                                                              2.13.1.1-r1             apk           
-sqlite-libs                                                          3.41.2-r2               apk           
-squizlabs/php_codesniffer                                            3.7.1                   php-composer  
-ssl_client                                                           1.36.1-r5               apk           
-swiftmailer/swiftmailer                                              v6.3.0                  php-composer  
-symfony/cache                                                        v5.4.15                 php-composer  
-symfony/cache-contracts                                              v2.5.2                  php-composer  
-symfony/console                                                      v5.4.15                 php-composer  
-symfony/css-selector                                                 v5.4.11                 php-composer  
-symfony/deprecation-contracts                                        v2.5.2                  php-composer  
-symfony/error-handler                                                v5.4.15                 php-composer  
-symfony/event-dispatcher                                             v5.4.9                  php-composer  
-symfony/event-dispatcher-contracts                                   v2.5.2                  php-composer  
-symfony/finder                                                       v5.4.11                 php-composer  
-symfony/http-foundation                                              v5.4.15                 php-composer  
-symfony/http-kernel                                                  v5.4.15                 php-composer  
-symfony/mime                                                         v5.4.14                 php-composer  
-symfony/options-resolver                                             v5.4.11                 php-composer  
-symfony/polyfill-ctype                                               v1.27.0                 php-composer  
-symfony/polyfill-iconv                                               v1.27.0                 php-composer  
-symfony/polyfill-intl-grapheme                                       v1.27.0                 php-composer  
-symfony/polyfill-intl-idn                                            v1.27.0                 php-composer  
-symfony/polyfill-intl-normalizer                                     v1.27.0                 php-composer  
-symfony/polyfill-mbstring                                            v1.27.0                 php-composer  
-symfony/polyfill-php72                                               v1.27.0                 php-composer  
-symfony/polyfill-php73                                               v1.27.0                 php-composer  
-symfony/polyfill-php80                                               v1.27.0                 php-composer  
-symfony/polyfill-php81                                               v1.27.0                 php-composer  
-symfony/process                                                      v5.4.11                 php-composer  
-symfony/routing                                                      v5.4.15                 php-composer  
-symfony/service-contracts                                            v2.5.2                  php-composer  
-symfony/string                                                       v5.4.15                 php-composer  
-symfony/thanks                                                       v1.2.10                 php-composer  
-symfony/translation                                                  v5.4.14                 php-composer  
-symfony/translation-contracts                                        v2.5.2                  php-composer  
-symfony/var-dumper                                                   v5.4.14                 php-composer  
-symfony/var-exporter                                                 v5.4.10                 php-composer  
-symfony/yaml                                                         v5.4.14                 php-composer  
-theseer/tokenizer                                                    1.2.1                   php-composer  
-tijsverkoyen/css-to-inline-styles                                    2.2.5                   php-composer  
-tzdata                                                               2023c-r1                apk           
-utmps-libs                                                           0.1.2.1-r1              apk           
-vlucas/phpdotenv                                                     v5.5.0                  php-composer  
-voku/portable-ascii                                                  1.6.1                   php-composer  
-webmozart/assert                                                     1.11.0                  php-composer  
-xz-libs                                                              5.4.3-r0                apk           
-zlib                                                                 1.2.13-r1               apk           
-zstd-libs                                                            1.5.5-r4                apk           
+NAME                                VERSION                TYPE           
+Hidden Input                        1, 0, 0, 0             dotnet          
+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.5-r0              apk             
+apache2-utils                       2.4.62-r0              apk             
+apk-tools                           2.14.4-r1              apk             
+apr                                 1.7.5-r0               apk             
+apr-util                            1.6.3-r1               apk             
+argon2-libs                         20190702-r5            apk             
+aws/aws-crt-php                     v1.2.4                 php-composer    
+aws/aws-sdk-php                     3.299.1                php-composer    
+barryvdh/laravel-ide-helper         v2.15.1                php-composer    
+barryvdh/reflection-docblock        v2.1.1                 php-composer    
+bash                                5.2.26-r0              apk             
+brick/math                          0.11.0                 php-composer    
+brotli-libs                         1.1.0-r2               apk             
+busybox                             1.36.1-r29             apk             
+busybox-binsh                       1.36.1-r29             apk             
+c-ares                              1.33.1-r0              apk             
+ca-certificates                     20241121-r1            apk             
+ca-certificates-bundle              20241121-r1            apk             
+carbonphp/carbon-doctrine-types     2.1.0                  php-composer    
+catatonit                           0.2.0-r0               apk             
+clue/stream-filter                  v1.7.0                 php-composer    
+composer                            2.8.5                  binary          
+composer/class-map-generator        1.1.0                  php-composer    
+composer/pcre                       3.1.1                  php-composer    
+coreutils                           9.5-r2                 apk             
+coreutils-env                       9.5-r2                 apk             
+coreutils-fmt                       9.5-r2                 apk             
+coreutils-sha512sum                 9.5-r2                 apk             
+curl                                8.11.1-r0              apk             
+dflydev/dot-access-data             v3.0.2                 php-composer    
+doctrine/cache                      2.2.0                  php-composer    
+doctrine/dbal                       3.8.2                  php-composer    
+doctrine/deprecations               1.1.3                  php-composer    
+doctrine/event-manager              2.0.0                  php-composer    
+doctrine/inflector                  2.0.9                  php-composer    
+doctrine/instantiator               2.0.0                  php-composer    
+doctrine/lexer                      3.0.1                  php-composer    
+dragonmantank/cron-expression       v3.3.3                 php-composer    
+egulias/email-validator             4.0.2                  php-composer    
+fakerphp/faker                      v1.23.1                php-composer    
+filp/whoops                         2.15.4                 php-composer    
+findutils                           4.9.0-r5               apk             
+fruitcake/php-cors                  v1.3.0                 php-composer    
+git                                 2.45.3-r0              apk             
+git-init-template                   2.45.3-r0              apk             
+gmp                                 6.3.0-r1               apk             
+graham-campbell/bounded-cache       v2.2.0                 php-composer    
+graham-campbell/github              v12.4.0                php-composer    
+graham-campbell/manager             v5.1.0                 php-composer    
+graham-campbell/result-type         v1.1.2                 php-composer    
+guzzlehttp/guzzle                   7.8.1                  php-composer    
+guzzlehttp/promises                 2.0.2                  php-composer    
+guzzlehttp/psr7                     2.6.2                  php-composer    
+guzzlehttp/uri-template             v1.0.3                 php-composer    
+hamcrest/hamcrest-php               v2.0.1                 php-composer    
+icu-data-en                         74.2-r0                apk             
+icu-libs                            74.2-r0                apk             
+jq                                  1.7.1-r0               apk             
+knplabs/github-api                  v3.13.0                php-composer    
+laravel/framework                   v10.44.0               php-composer    
+laravel/prompts                     v0.1.15                php-composer    
+laravel/serializable-closure        v1.3.3                 php-composer    
+laravel/tinker                      v2.9.0                 php-composer    
+laravel/ui                          v4.4.0                 php-composer    
+laravelcollective/html              v6.4.1                 php-composer    
+lcobucci/jwt                        5.2.0                  php-composer    
+league/commonmark                   2.4.2                  php-composer    
+league/config                       v1.2.0                 php-composer    
+league/flysystem                    3.24.0                 php-composer    
+league/flysystem-aws-s3-v3          3.24.0                 php-composer    
+league/flysystem-local              3.23.1                 php-composer    
+league/mime-type-detection          1.15.0                 php-composer    
+libacl                              2.3.2-r0               apk             
+libattr                             2.5.2-r0               apk             
+libbsd                              0.12.2-r0              apk             
+libbz2                              1.0.8-r6               apk             
+libcrypto3                          3.3.2-r1               apk             
+libcurl                             8.11.1-r0              apk             
+libedit                             20240517.3.1-r0        apk             
+libexpat                            2.6.4-r0               apk             
+libgcc                              13.2.1_git20240309-r0  apk             
+libidn2                             2.3.7-r0               apk             
+libintl                             0.22.5-r0              apk             
+libmd                               1.1.0-r0               apk             
+libncursesw                         6.4_p20240420-r2       apk             
+libpq                               16.6-r0                apk             
+libproc2                            4.0.4-r0               apk             
+libpsl                              0.21.5-r1              apk             
+libssl3                             3.3.2-r1               apk             
+libstdc++                           13.2.1_git20240309-r0  apk             
+libunistring                        1.2-r0                 apk             
+libuuid                             2.40.1-r1              apk             
+libxml2                             2.12.7-r0              apk             
+libzip                              1.10.1-r0              apk             
+linux-pam                           1.6.0-r0               apk             
+logrotate                           3.21.0-r1              apk             
+mockery/mockery                     1.6.7                  php-composer    
+monolog/monolog                     3.5.0                  php-composer    
+mtdowling/jmespath.php              2.7.0                  php-composer    
+musl                                1.2.5-r0               apk             
+musl-utils                          1.2.5-r0               apk             
+myclabs/deep-copy                   1.11.1                 php-composer    
+nano                                8.0-r0                 apk             
+ncurses-terminfo-base               6.4_p20240420-r2       apk             
+nesbot/carbon                       2.72.3                 php-composer    
+netcat-openbsd                      1.226-r0               apk             
+nette/schema                        v1.3.0                 php-composer    
+nette/utils                         v4.0.4                 php-composer    
+nghttp2-libs                        1.62.1-r0              apk             
+nginx                               1.26.2-r0              apk             
+nikic/php-parser                    v5.0.0                 php-composer    
+nunomaduro/collision                v6.4.0                 php-composer    
+nunomaduro/termwind                 v1.15.1                php-composer    
+oniguruma                           6.9.9-r0               apk             
+openssl                             3.3.2-r1               apk             
+pcre                                8.45-r3                apk             
+pcre2                               10.43-r0               apk             
+phar-io/manifest                    2.0.3                  php-composer    
+phar-io/version                     3.2.1                  php-composer    
+php-http/cache-plugin               1.8.1                  php-composer    
+php-http/client-common              2.7.1                  php-composer    
+php-http/discovery                  1.19.2                 php-composer    
+php-http/httplug                    2.4.0                  php-composer    
+php-http/message                    1.16.0                 php-composer    
+php-http/message-factory            1.1.0                  php-composer    
+php-http/multipart-stream-builder   1.3.0                  php-composer    
+php-http/promise                    1.3.0                  php-composer    
+php83                               8.3.15-r0              apk             
+php83-common                        8.3.15-r0              apk             
+php83-ctype                         8.3.15-r0              apk             
+php83-curl                          8.3.15-r0              apk             
+php83-dom                           8.3.15-r0              apk             
+php83-fileinfo                      8.3.15-r0              apk             
+php83-fpm                           8.3.15-r0              apk             
+php83-iconv                         8.3.15-r0              apk             
+php83-intl                          8.3.15-r0              apk             
+php83-mbstring                      8.3.15-r0              apk             
+php83-mysqlnd                       8.3.15-r0              apk             
+php83-opcache                       8.3.15-r0              apk             
+php83-openssl                       8.3.15-r0              apk             
+php83-pdo                           8.3.15-r0              apk             
+php83-pdo_mysql                     8.3.15-r0              apk             
+php83-pdo_pgsql                     8.3.15-r0              apk             
+php83-pdo_sqlite                    8.3.15-r0              apk             
+php83-phar                          8.3.15-r0              apk             
+php83-session                       8.3.15-r0              apk             
+php83-simplexml                     8.3.15-r0              apk             
+php83-tokenizer                     8.3.15-r0              apk             
+php83-xml                           8.3.15-r0              apk             
+php83-xmlwriter                     8.3.15-r0              apk             
+php83-zip                           8.3.15-r0              apk             
+phpdocumentor/reflection-common     2.2.0                  php-composer    
+phpdocumentor/type-resolver         1.8.0                  php-composer    
+phpoption/phpoption                 1.9.2                  php-composer    
+phpstan/phpdoc-parser               1.25.0                 php-composer    
+phpunit/php-code-coverage           9.2.30                 php-composer    
+phpunit/php-file-iterator           3.0.6                  php-composer    
+phpunit/php-invoker                 3.1.1                  php-composer    
+phpunit/php-text-template           2.0.4                  php-composer    
+phpunit/php-timer                   5.0.3                  php-composer    
+phpunit/phpunit                     9.6.16                 php-composer    
+popt                                1.19-r3                apk             
+procps-ng                           4.0.4-r0               apk             
+psr/cache                           3.0.0                  php-composer    
+psr/clock                           1.0.0                  php-composer    
+psr/container                       2.0.2                  php-composer    
+psr/event-dispatcher                1.0.0                  php-composer    
+psr/http-client                     1.0.3                  php-composer    
+psr/http-factory                    1.0.2                  php-composer    
+psr/http-message                    2.0                    php-composer    
+psr/log                             3.0.0                  php-composer    
+psr/simple-cache                    3.0.0                  php-composer    
+psy/psysh                           v0.12.0                php-composer    
+ralouphie/getallheaders             3.0.3                  php-composer    
+ramsey/collection                   2.0.0                  php-composer    
+ramsey/uuid                         4.7.5                  php-composer    
+readline                            8.2.10-r0              apk             
+scanelf                             1.3.7-r2               apk             
+sebastian/cli-parser                1.0.1                  php-composer    
+sebastian/code-unit                 1.0.8                  php-composer    
+sebastian/code-unit-reverse-lookup  2.0.3                  php-composer    
+sebastian/comparator                4.0.8                  php-composer    
+sebastian/complexity                2.0.3                  php-composer    
+sebastian/diff                      4.0.5                  php-composer    
+sebastian/environment               5.1.5                  php-composer    
+sebastian/exporter                  4.0.5                  php-composer    
+sebastian/global-state              5.0.6                  php-composer    
+sebastian/lines-of-code             1.0.4                  php-composer    
+sebastian/object-enumerator         4.0.4                  php-composer    
+sebastian/object-reflector          2.0.4                  php-composer    
+sebastian/recursion-context         4.0.5                  php-composer    
+sebastian/resource-operations       3.0.3                  php-composer    
+sebastian/type                      3.2.1                  php-composer    
+sebastian/version                   3.0.2                  php-composer    
+shadow                              4.15.1-r0              apk             
+skalibs                             2.14.1.1-r0            apk             
+spatie/backtrace                    1.5.3                  php-composer    
+spatie/flare-client-php             1.4.4                  php-composer    
+spatie/ignition                     1.12.0                 php-composer    
+spatie/laravel-ignition             2.4.2                  php-composer    
+sqlite-libs                         3.45.3-r1              apk             
+squizlabs/php_codesniffer           3.9.0                  php-composer    
+ssl_client                          1.36.1-r29             apk             
+symfony/cache                       v6.4.3                 php-composer    
+symfony/cache-contracts             v3.4.0                 php-composer    
+symfony/console                     v6.4.3                 php-composer    
+symfony/css-selector                v7.0.3                 php-composer    
+symfony/deprecation-contracts       v3.4.0                 php-composer    
+symfony/error-handler               v6.4.3                 php-composer    
+symfony/event-dispatcher            v7.0.3                 php-composer    
+symfony/event-dispatcher-contracts  v3.4.0                 php-composer    
+symfony/finder                      v6.4.0                 php-composer    
+symfony/http-foundation             v6.4.3                 php-composer    
+symfony/http-kernel                 v6.4.3                 php-composer    
+symfony/mailer                      v6.4.3                 php-composer    
+symfony/mime                        v6.4.3                 php-composer    
+symfony/options-resolver            v7.0.0                 php-composer    
+symfony/polyfill-ctype              v1.29.0                php-composer    
+symfony/polyfill-intl-grapheme      v1.29.0                php-composer    
+symfony/polyfill-intl-idn           v1.29.0                php-composer    
+symfony/polyfill-intl-normalizer    v1.29.0                php-composer    
+symfony/polyfill-mbstring           v1.29.0                php-composer    
+symfony/polyfill-php72              v1.29.0                php-composer    
+symfony/polyfill-php80              v1.29.0                php-composer    
+symfony/polyfill-php83              v1.29.0                php-composer    
+symfony/polyfill-uuid               v1.29.0                php-composer    
+symfony/process                     v6.4.3                 php-composer    
+symfony/routing                     v6.4.3                 php-composer    
+symfony/service-contracts           v3.4.1                 php-composer    
+symfony/string                      v7.0.3                 php-composer    
+symfony/thanks                      v1.2.10                php-composer    
+symfony/translation                 v6.4.3                 php-composer    
+symfony/translation-contracts       v3.4.1                 php-composer    
+symfony/uid                         v6.4.3                 php-composer    
+symfony/var-dumper                  v6.4.3                 php-composer    
+symfony/var-exporter                v7.0.3                 php-composer    
+symfony/yaml                        v6.4.3                 php-composer    
+theseer/tokenizer                   1.2.2                  php-composer    
+tijsverkoyen/css-to-inline-styles   v2.2.7                 php-composer    
+tzdata                              2024b-r0               apk             
+utmps-libs                          0.1.2.2-r1             apk             
+vlucas/phpdotenv                    v5.6.0                 php-composer    
+voku/portable-ascii                 2.0.1                  php-composer    
+webmozart/assert                    1.11.0                 php-composer    
+xz-libs                             5.6.2-r0               apk             
+zlib                                1.3.1-r1               apk             
+zstd-libs                           1.5.6-r0               apk             
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -11,71 +11,124 @@ project_blurb: |

  Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
-
+project_categories: "Dashboard"
 # supported architectures
 available_architectures:
-  - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
-  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-
+  - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
+  - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
 # development version
 development_versions: true
 development_versions_items:
-  - { tag: "latest", desc: "Stable Heimdall releases." }
-  - { tag: "development", desc: "Latest commit from the github 2.x branch." }
-
+  - {tag: "latest", desc: "Stable Heimdall releases."}
+  - {tag: "development", desc: "Latest commit from the github 2.x branch."}
 # container parameters
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Contains all relevant configuration files." }
+  - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files"}
 param_usage_include_ports: true
 param_ports:
-  - { external_port: "80", internal_port: "80", port_desc: "http gui" }
-  - { external_port: "443", internal_port: "443", port_desc: "https gui" }
-param_usage_include_env: true
-param_env_vars:
-  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London"}
-
+  - {external_port: "80", internal_port: "80", port_desc: "http gui"}
+  - {external_port: "443", internal_port: "443", port_desc: "https gui"}
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
  Access the web gui at http://SERVERIP:PORT

-
  ### Adding password protection
-  
-  This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd <username>`. Replace <username> with a username of your choice and you will be asked to enter a password. Uncomment the `basic auth` lines in `/config/nginx/site-confs/default.conf` and restart the container.

+  This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd <username>`. Replace <username> with a username of your choice and you will be asked to enter a password. Uncomment the `basic auth` lines in `/config/nginx/site-confs/default.conf` and restart the container.
+# init diagram
+init_diagram: |
+  "heimdall:latest": {
+    docker-mods
+    base {
+      fix-attr +\nlegacy cont-init
+    }
+    docker-mods -> base
+    legacy-services
+    custom services
+    init-services -> legacy-services
+    init-services -> custom services
+    custom services -> legacy-services
+    legacy-services -> ci-service-check
+    init-migrations -> init-adduser
+    init-nginx-end -> init-config
+    init-os-end -> init-config
+    init-config -> init-config-end
+    init-heimdall-config -> init-config-end
+    init-os-end -> init-crontab-config
+    init-mods-end -> init-custom-files
+    base -> init-envfile
+    init-os-end -> init-folders
+    init-nginx-end -> init-heimdall-config
+    init-php -> init-keygen
+    base -> init-migrations
+    base -> init-mods
+    init-config-end -> init-mods
+    init-version-checks -> init-mods
+    init-mods -> init-mods-end
+    init-mods-package-install -> init-mods-end
+    init-mods -> init-mods-package-install
+    init-samples -> init-nginx
+    init-permissions -> init-nginx-end
+    base -> init-os-end
+    init-adduser -> init-os-end
+    init-envfile -> init-os-end
+    init-migrations -> init-os-end
+    init-keygen -> init-permissions
+    init-nginx -> init-php
+    init-folders -> init-samples
+    init-custom-files -> init-services
+    init-mods-end -> init-services
+    init-config-end -> init-version-checks
+    init-services -> svc-cron
+    svc-cron -> legacy-services
+    init-services -> svc-nginx
+    svc-nginx -> legacy-services
+    init-services -> svc-php-fpm
+    svc-php-fpm -> legacy-services
+    init-services -> svc-queue
+    svc-queue -> legacy-services
+  }
+  Base Images: {
+    "baseimage-alpine-nginx:3.20" <- "baseimage-alpine:3.20"
+  }
+  "heimdall:latest" <- Base Images
 # changelog
 changelogs:
-  - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
-  - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
-  - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
-  - { date: "14.11.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
-  - { date: "04.11.22:", desc: "Build commits to upstream branch 2.x for the `development` tag." }
-  - { date: "13.03.21:", desc: "Make searchproviders.yaml user configurable." }
-  - { date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel." }
-  - { date: "10.02.21:", desc: "Rebasing to alpine 3.13." }
-  - { date: "17.08.20:", desc: "Add php7-curl." }
-  - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
-  - { date: "17.01.20:", desc: "Use nginx from baseimage." }
-  - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
-  - { date: "16.07.19:", desc: "Save laravel.log to /config/log/heimdall." }
-  - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
-  - { date: "01.04.19:", desc: "Fix permission detect logic." }
-  - { date: "26.03.19:", desc: "Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown." }
-  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
-  - { date: "15.03.19:", desc: "Clarify docker image tags in readme." }
-  - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }
-  - { date: "16.01.18:", desc: "Generate random app key in .env for new installs." }
-  - { date: "20.11.18:", desc: "Upgrade baseimage packages during build." }
-  - { date: "04.11.18:", desc: "Add php7-zip." }
-  - { date: "31.10.18:", desc: "Add queue service." }
-  - { date: "17.10.18:", desc: "Symlink avatars folder." }
-  - { date: "16.10.18:", desc: "Updated fastcgi_params for user login support." }
-  - { date: "07.10.18:", desc: "Symlink `.env` rather than copy. It now resides under `/config/www`" }
-  - { date: "30.09.18:", desc: "Multi-arch image. Move `.env` to `/config`." }
-  - { date: "05.09.18:", desc: "Rebase to alpine linux 3.8." }
-  - { date: "06.03.18:", desc: "Use password protection if htpasswd is set. Existing users can delete their default site config at /config/nginx/site-confs/default.conf and restart the container, a new default site config with htpasswd support will be created in its place" }
-  - { date: "12.02.18:", desc: "Initial Release." }
+  - {date: "27.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
+  - {date: "07.03.24:", desc: "Enable the opcache and disable file revalidation."}
+  - {date: "06.03.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf."}
+  - {date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}
+  - {date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf."}
+  - {date: "13.04.23:", desc: "Move ssl.conf include to default.conf."}
+  - {date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1."}
+  - {date: "14.11.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))."}
+  - {date: "04.11.22:", desc: "Build commits to upstream branch 2.x for the `development` tag."}
+  - {date: "13.03.21:", desc: "Make searchproviders.yaml user configurable."}
+  - {date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel."}
+  - {date: "10.02.21:", desc: "Rebasing to alpine 3.13."}
+  - {date: "17.08.20:", desc: "Add php7-curl."}
+  - {date: "01.06.20:", desc: "Rebasing to alpine 3.12."}
+  - {date: "17.01.20:", desc: "Use nginx from baseimage."}
+  - {date: "19.12.19:", desc: "Rebasing to alpine 3.11."}
+  - {date: "16.07.19:", desc: "Save laravel.log to /config/log/heimdall."}
+  - {date: "28.06.19:", desc: "Rebasing to alpine 3.10."}
+  - {date: "01.04.19:", desc: "Fix permission detect logic."}
+  - {date: "26.03.19:", desc: "Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown."}
+  - {date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag."}
+  - {date: "15.03.19:", desc: "Clarify docker image tags in readme."}
+  - {date: "22.02.19:", desc: "Rebasing to alpine 3.9."}
+  - {date: "16.01.18:", desc: "Generate random app key in .env for new installs."}
+  - {date: "20.11.18:", desc: "Upgrade baseimage packages during build."}
+  - {date: "04.11.18:", desc: "Add php7-zip."}
+  - {date: "31.10.18:", desc: "Add queue service."}
+  - {date: "17.10.18:", desc: "Symlink avatars folder."}
+  - {date: "16.10.18:", desc: "Updated fastcgi_params for user login support."}
+  - {date: "07.10.18:", desc: "Symlink `.env` rather than copy. It now resides under `/config/www`"}
+  - {date: "30.09.18:", desc: "Multi-arch image. Move `.env` to `/config`."}
+  - {date: "05.09.18:", desc: "Rebase to alpine linux 3.8."}
+  - {date: "06.03.18:", desc: "Use password protection if htpasswd is set. Existing users can delete their default site config at /config/nginx/site-confs/default.conf and restart the container, a new default site config with htpasswd support will be created in its place"}
+  - {date: "12.02.18:", desc: "Initial Release."}
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -1,36 +0,0 @@
-## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample
-
-server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
-
-    listen 443 ssl http2 default_server;
-    listen [::]:443 ssl http2 default_server;
-
-    server_name _;
-
-    include /config/nginx/ssl.conf;
-
-    root /app/www/public;
-    index index.html index.htm index.php;
-
-    location / {
-        # enable for basic auth
-        #auth_basic "Restricted";
-        #auth_basic_user_file /config/nginx/.htpasswd;
-
-        try_files $uri $uri/ /index.html /index.php$is_args$args;
-    }
-
-    location ~ ^(.+\.php)(.*)$ {
-        fastcgi_split_path_info ^(.+\.php)(.*)$;
-        fastcgi_pass 127.0.0.1:9000;
-        fastcgi_index index.php;
-        include /etc/nginx/fastcgi_params;
-    }
-
-    # deny access to .htaccess/.htpasswd files
-    location ~ /\.ht {
-        deny all;
-    }
-}
--- a/root/migrations/02-default-location
+++ b/root/migrations/02-default-location
Author	SHA1	Message	Date
LinuxServer-CI	8fde173b55	Bot Updating Templated Files	2025-01-31 18:37:58 +00:00
LinuxServer-CI	7e221490a1	Bot Updating Templated Files	2025-01-31 18:36:28 +00:00
LinuxServer-CI	0b86fded9b	Bot Updating Package Versions	2025-01-24 18:37:18 +00:00
quietsy	34e623e206	Merge pull request #158 from linuxserver/add-project-categories Add categories to readme-vars.yml	2025-01-22 19:53:46 +02:00
quietsy	fe1da81d91	Add categories to readme-vars.yml	2025-01-22 14:53:01 +02:00
LinuxServer-CI	04b2db2a1e	Bot Updating Package Versions	2025-01-17 18:36:41 +00:00
LinuxServer-CI	6f7a724083	Bot Updating Package Versions	2025-01-10 18:38:17 +00:00
LinuxServer-CI	bd423ad357	Bot Updating Package Versions	2024-12-27 18:37:08 +00:00
LinuxServer-CI	c87c3ad09f	Bot Updating Package Versions	2024-12-20 18:42:28 +00:00
LinuxServer-CI	d54a4cf599	Bot Updating Templated Files	2024-12-20 18:39:05 +00:00
LinuxServer-CI	25fcd4876a	Bot Updating Templated Files	2024-12-20 18:37:32 +00:00
LinuxServer-CI	83122a9d03	Bot Updating Package Versions	2024-12-13 18:42:33 +00:00
LinuxServer-CI	274349166b	Bot Updating Templated Files	2024-12-06 18:44:22 +00:00
LinuxServer-CI	54548adcc7	Bot Updating Templated Files	2024-12-06 18:42:21 +00:00
LinuxServer-CI	e1470dc8ab	Bot Updating Templated Files	2024-12-06 18:40:28 +00:00
LinuxServer-CI	413458f588	Bot Updating Package Versions	2024-11-29 18:41:01 +00:00
LinuxServer-CI	6b689fed34	Bot Updating Package Versions	2024-11-22 18:38:58 +00:00
LinuxServer-CI	5240552ed4	Bot Updating Templated Files	2024-11-15 18:39:32 +00:00
LinuxServer-CI	3f9edfc3cc	Bot Updating Templated Files	2024-11-15 18:37:59 +00:00
LinuxServer-CI	a460662903	Bot Updating Package Versions	2024-11-01 18:36:43 +00:00
LinuxServer-CI	2b6f0b7927	Bot Updating Package Versions	2024-10-25 18:37:24 +00:00
LinuxServer-CI	9fb77214d3	Bot Updating Templated Files	2024-10-04 18:37:22 +00:00
LinuxServer-CI	fc112da970	Bot Updating Package Versions	2024-09-27 18:42:02 +00:00
LinuxServer-CI	b8432990ae	Bot Updating Templated Files	2024-09-27 18:39:58 +00:00
LinuxServer-CI	698b56ae07	Bot Updating Templated Files	2024-09-27 18:38:40 +00:00
LinuxServer-CI	7c8281caba	Bot Updating Templated Files	2024-09-27 18:37:12 +00:00
LinuxServer-CI	2374a19761	Bot Updating Package Versions	2024-09-20 18:36:33 +00:00
LinuxServer-CI	694a33a9c1	Bot Updating Package Versions	2024-09-13 18:38:02 +00:00
LinuxServer-CI	59959cbae7	Bot Updating Package Versions	2024-09-06 18:35:43 +00:00
LinuxServer-CI	def983ab25	Bot Updating Package Versions	2024-08-23 18:37:45 +00:00
LinuxServer-CI	95cdaf22af	Bot Updating Templated Files	2024-08-23 18:35:34 +00:00
LinuxServer-CI	36e67b267e	Bot Updating Templated Files	2024-08-23 18:34:00 +00:00
LinuxServer-CI	019bf21bf2	Bot Updating Package Versions	2024-08-16 18:34:50 +00:00
LinuxServer-CI	81a23c1ffe	Bot Updating Package Versions	2024-08-09 18:36:21 +00:00
LinuxServer-CI	b601769e0f	Bot Updating Package Versions	2024-08-02 18:35:10 +00:00
LinuxServer-CI	822a1e7bcd	Bot Updating Package Versions	2024-07-26 18:32:46 +00:00
Eric Nemchik	a70321c371	Merge pull request #153 from linuxserver/delete-default-conf Delete root/defaults/nginx/site-confs/default.conf.sample	2024-07-19 16:35:59 -05:00
LinuxServer-CI	f399491bf6	Bot Updating Package Versions	2024-07-19 18:33:47 +00:00
Eric Nemchik	493b46774c	Delete root/defaults/nginx/site-confs/default.conf.sample redundant to base	2024-07-16 20:44:11 -05:00
LinuxServer-CI	bf821250ce	Bot Updating Package Versions	2024-07-12 18:39:29 +00:00
LinuxServer-CI	2c7e8e2347	Bot Updating Templated Files	2024-07-12 18:37:23 +00:00
LinuxServer-CI	0a811d8ff0	Bot Updating Templated Files	2024-07-12 18:35:17 +00:00
LinuxServer-CI	a2b5099589	Bot Updating Package Versions	2024-07-05 18:34:20 +00:00
LinuxServer-CI	d1de807dbd	Bot Updating Package Versions	2024-06-28 09:08:39 +00:00
Roxedus	2d0a689cfa	Merge pull request #152 from linuxserver/master-3.20	2024-06-28 11:04:07 +02:00
thespad	32482621b1	Rebase to 3.20	2024-06-27 16:33:46 +01:00
LinuxServer-CI	ae11a9757a	Bot Updating Package Versions	2024-06-21 18:34:08 +00:00
LinuxServer-CI	438ca48450	Bot Updating Package Versions	2024-06-14 18:34:10 +00:00
LinuxServer-CI	f4d5ee4d4b	Bot Updating Package Versions	2024-05-24 18:36:32 +00:00
LinuxServer-CI	50b7879b20	Bot Updating Templated Files	2024-05-24 18:34:18 +00:00
LinuxServer-CI	3a54e1e8a4	Bot Updating Templated Files	2024-05-24 18:32:03 +00:00
LinuxServer-CI	0fa6c3b178	Bot Updating Package Versions	2024-05-17 18:34:23 +00:00
LinuxServer-CI	5f8befb76f	Bot Updating Package Versions	2024-05-10 18:34:30 +00:00
LinuxServer-CI	b4c8ae5421	Bot Updating Templated Files	2024-05-10 18:30:46 +00:00
LinuxServer-CI	0457e2e6c9	Bot Updating Package Versions	2024-05-03 18:34:58 +00:00
LinuxServer-CI	f2adb642db	Bot Updating Templated Files	2024-05-03 18:30:46 +00:00
LinuxServer-CI	d7534720d4	Bot Updating Package Versions	2024-04-26 18:31:53 +00:00
LinuxServer-CI	44ed891b5b	Bot Updating Package Versions	2024-04-19 18:30:03 +00:00
LinuxServer-CI	c4bfc70a35	Bot Updating Package Versions	2024-04-12 18:27:59 +00:00
LinuxServer-CI	810384ffc8	Bot Updating Package Versions	2024-04-05 18:29:54 +00:00
LinuxServer-CI	3980f54fb1	Bot Updating Package Versions	2024-03-29 18:29:08 +00:00
LinuxServer-CI	e1970defc6	Bot Updating Package Versions	2024-03-22 18:30:26 +00:00
LinuxServer-CI	0654cc0288	Bot Updating Package Versions	2024-03-15 18:35:44 +00:00
LinuxServer-CI	7cf45e7130	Bot Updating Templated Files	2024-03-15 18:30:00 +00:00
LinuxServer-CI	696994332b	Bot Updating Package Versions	2024-03-07 13:54:12 +00:00
LinuxServer-CI	bbcf5f8d5a	Bot Updating Templated Files	2024-03-07 13:51:18 +00:00
Andrew Berry	1aedaec411	Enable the PHP opcache and disable revalidation (#149 ) * Enable the PHP opcache and disable revalidation * Add opcache update to changelog	2024-03-07 08:49:31 -05:00
LinuxServer-CI	dee7bdbd92	Bot Updating Templated Files	2024-03-06 17:56:36 +00:00
Eric Nemchik	a721071117	Cleanup default site conf (#142 ) * Cleanup default site conf Signed-off-by: Eric Nemchik <eric@nemchik.com> * update dates --------- Signed-off-by: Eric Nemchik <eric@nemchik.com> Co-authored-by: aptalca <541623+aptalca@users.noreply.github.com>	2024-03-06 12:52:31 -05:00
LinuxServer-CI	2e5e686e36	Bot Updating Package Versions	2024-03-01 18:31:19 +00:00
LinuxServer-CI	86fa1c70a3	Bot Updating Templated Files	2024-02-23 18:31:22 +00:00
LinuxServer-CI	2b2f8dfd6d	Bot Updating Templated Files	2024-02-23 18:29:36 +00:00
LinuxServer-CI	46eacc80b8	Bot Updating Package Versions	2024-02-18 21:49:23 +00:00
LinuxServer-CI	0f3c2b0401	Bot Updating Package Versions	2024-02-17 15:45:10 +00:00
Adam	837c5942db	Merge pull request #145 from linuxserver/feature/add_dom_php_extension Add DOM php extension	2024-02-17 14:35:30 +00:00
Chris Hunt	879e81fb6b	Add DOM php extension	2024-02-17 08:29:57 +00:00
LinuxServer-CI	c5500f1c10	Bot Updating Package Versions	2024-02-16 18:29:23 +00:00
LinuxServer-CI	0830b88bd6	Bot Updating Package Versions	2024-02-09 18:29:01 +00:00
LinuxServer-CI	27f3745f2a	Bot Updating Package Versions	2024-02-02 18:30:25 +00:00
LinuxServer-CI	bbecc0b09a	Bot Updating Package Versions	2024-01-26 16:43:37 +00:00
LinuxServer-CI	dad5208309	Bot Updating Templated Files	2024-01-26 16:39:55 +00:00
Eric Nemchik	d999bb49de	Merge pull request #140 from linuxserver/3.19 Rebase to Alpine 3.19	2024-01-26 10:37:50 -06:00
LinuxServer-CI	6b588ea844	Bot Updating Package Versions	2024-01-19 18:31:46 +00:00
LinuxServer-CI	d893aac03f	Bot Updating Package Versions	2024-01-12 18:35:54 +00:00
LinuxServer-CI	6432966c54	Bot Updating Templated Files	2024-01-12 18:32:20 +00:00
LinuxServer-CI	4ea20437ae	Bot Updating Templated Files	2024-01-12 18:30:36 +00:00
LinuxServer-CI	883863471c	Bot Updating Package Versions	2024-01-05 18:32:08 +00:00
Eric Nemchik	ca4da80275	Rebase to Alpine 3.19 Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-12-23 18:12:50 -06:00
LinuxServer-CI	578be1f1f3	Bot Updating Package Versions	2023-12-22 18:31:05 +00:00