Bot Updating Package Versions

Bot Updating Templated Files
2026-04-12 13:31:40 +09:00 · 2024-11-01 18:36:41 +00:00 · 2024-10-25 18:37:08 +00:00 · 2024-10-04 18:36:08 +00:00 · 2024-09-27 18:42:33 +00:00 · 2024-09-27 18:40:04 +00:00
16 changed files with 702 additions and 651 deletions
--- a/.github/ISSUE_TEMPLATE/issue.bug.yml
+++ b/.github/ISSUE_TEMPLATE/issue.bug.yml
@@ -67,10 +67,10 @@ body:
  - type: textarea
    attributes:
      description: |
-        Provide a full docker log, output of "docker logs linuxserver.io"
+        Provide a full docker log, output of "docker logs 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,27 @@ jobs:
  external-trigger-development:
    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/development'
        env:
          SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
        run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT }}" ]; then
+          printf "# External trigger for docker-heimdall\n\n" >> $GITHUB_STEP_SUMMARY
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT is set; skipping trigger. ****"
+          if grep -q "^heimdall_development" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
-            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`heimdall_development\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
-          echo "**** External trigger running off of development branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT\". ****"
+          echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-          echo "External trigger running off of development branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT\`" >> $GITHUB_STEP_SUMMARY
+          echo "> External trigger running off of development branch. To disable this trigger, add \`heimdall_development\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
-          echo "**** Retrieving external version ****"
+          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/commits/2.x" | jq -r '. | .sha' | cut -c1-8)
          echo "Type is \`github_commit\`" >> $GITHUB_STEP_SUMMARY
          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 development"
            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,9 +36,8 @@ 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 "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
+          echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
          echo "**** Retrieving last pushed version ****"
          image="linuxserver/heimdall"
          tag="development"
          token=$(curl -sX GET \
@@ -60,45 +64,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 development"
            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/development/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 ****"
+            if [[ "${artifacts_found}" == "false" ]]; then
-            echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
+              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            response=$(curl -iX POST \
+              echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/buildWithParameters?PACKAGE_CHECK=false \
+              FAILURE_REASON="New version ${EXT_RELEASE} for heimdall tag development is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+              curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-            echo "**** Jenkins job queue url: ${response%$'\r'} ****"
+                "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
-            echo "**** Sleeping 10 seconds until job starts ****"
+                "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-            sleep 10
+            else
-            buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+              printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
-            buildurl="${buildurl%$'\r'}"
+              echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
-            echo "**** Jenkins job build url: ${buildurl} ****"
+              if "${artifacts_found}" == "true" ]]; then
-            echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
+                echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
-            echo "**** Attempting to change the Jenkins job description ****"
+              fi
-            curl -iX POST \
+              response=$(curl -iX POST \
-              "${buildurl}submitDescription" \
+                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/buildWithParameters?PACKAGE_CHECK=false \
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-              --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+              echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
-              --data-urlencode "Submit=Submit"
+              echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
-            echo "**** Notifying Discord ****"
+              sleep 10
-            TRIGGER_REASON="A version change was detected for heimdall tag development. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+              buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              buildurl="${buildurl%$'\r'}"
-              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
+              echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+              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 development. 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: ****"
+          printf "# External trigger scheduler for docker-heimdall\n\n" >> $GITHUB_STEP_SUMMARY
-          git for-each-ref --format='%(refname:short)' refs/remotes
+          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:short)' refs/remotes)
+          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
          do
-            br=$(echo "$br" | sed 's|origin/||g')
+            if [[ "${br}" == "HEAD" ]]; then
-            echo "**** Evaluating branch ${br} ****"
+              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." >> $GITHUB_STEP_SUMMARY
                echo "Triggering external trigger workflow for branch ${br}" >> $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 due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
                echo "Skipping branch ${br} 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 due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
              echo "Skipping branch ${br} 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-development:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3.1.0
      - name: Package Trigger
        if: github.ref == 'refs/heads/development'
        run: |
          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT }}" ]; then
            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT is set; skipping trigger. ****"
            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT\` 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/development/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 development branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT\". ****"
          echo "Package trigger running off of development branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT\`" >> $GITHUB_STEP_SUMMARY
          response=$(curl -iX POST \
            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/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,74 @@ 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: ****"
+          printf "# Package trigger scheduler for docker-heimdall\n\n" >> $GITHUB_STEP_SUMMARY
-          git for-each-ref --format='%(refname:short)' refs/remotes
+          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:short)' refs/remotes)
+          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
          do
-            br=$(echo "$br" | sed 's|origin/||g')
+            if [[ "${br}" == "HEAD" ]]; then
-            echo "**** Evaluating branch ${br} ****"
+              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml | yq -r '.ls_branch')
+              continue
-            if [ "${br}" == "${ls_branch}" ]; then
+            fi
-              echo "**** Branch ${br} appears to be live; checking workflow. ****"
+            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
-              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
+            JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml)
-                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
+            if [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
-                echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
+              echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
-                triggered_branches="${triggered_branches}${br} "
+              if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then
-                curl -iX POST \
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
+                echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY
-                  -H "Accept: application/vnd.github.v3+json" \
+                skipped_branches="${skipped_branches}${br} "
-                  -d "{\"ref\":\"refs/heads/${br}\"}" \
+              elif grep -q "^heimdall_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then
-                  https://api.github.com/repos/linuxserver/docker-heimdall/actions/workflows/package_trigger.yml/dispatches
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                sleep 30
+                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') == "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 "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-                echo "Skipping branch ${br} due to no package trigger workflow present." >> $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|")
                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 package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
                  --data-urlencode "Submit=Submit"
                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} ****"
+          if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
-          echo "**** Notifying Discord ****"
+            if [[ -n "${triggered_branches}" ]]; then
-          curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
-            "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"}],
+            fi
-            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+            if [[ -n "${skipped_branches}" ]]; then
              NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
            fi
            echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
            echo "**** Notifying Discord ****"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
              "description": "**Package Check Build(s) Triggered for heimdall** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-heimdall/activity/"' \n"}],
              "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/12
+++ b/12
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20
 # set version label
 ARG BUILD_DATE
@@ -9,23 +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 \
    php83-dom \
    php83-intl \
    php83-opcache \
    php83-pdo_mysql \
    php83-pdo_pgsql \
    php83-pdo_sqlite \
    php83-pdo_mysql \
    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 && \
@@ -41,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.19
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20
 # set version label
 ARG BUILD_DATE
@@ -9,23 +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 \
    php83-dom \
    php83-intl \
    php83-opcache \
    php83-pdo_mysql \
    php83-pdo_pgsql \
    php83-pdo_sqlite \
    php83-pdo_mysql \
    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 && \
@@ -41,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/503
+++ b/503
@@ -17,6 +17,8 @@ pipeline {
    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'
@@ -34,14 +36,28 @@ pipeline {
    CI_PORT='80'
    CI_SSL='false'
    CI_DELAY='120'
-    CI_DOCKERENV='TZ=US/Pacific'
+    CI_DOCKERENV=''
-    CI_AUTH='user:password'
+    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)
              if [[ -n "${containers}" ]]; then
@@ -68,7 +84,7 @@ pipeline {
          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}" '''
@@ -255,9 +271,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 "\
+                  ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
-                    apk add --no-cache py3-pip && \
+                    apk add --no-cache python3 && \
-                    pip install s3cmd && \
+                    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" || :'''
        }
      }
@@ -272,150 +290,178 @@ pipeline {
        }
      }
      steps {
-        withCredentials([
+        sh '''#! /bin/bash
-          [
+              set -e
-            $class: 'UsernamePasswordMultiBinding',
+              TEMPDIR=$(mktemp -d)
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+              docker pull ghcr.io/linuxserver/jenkins-builder:latest
-            usernameVariable: 'DOCKERUSER',
+              # Cloned repo paths for templating:
-            passwordVariable: 'DOCKERPASS'
+              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch development of ${LS_USER}/${LS_REPO} for running the jenkins builder on
-          ]
+              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch development 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
-          sh '''#! /bin/bash
+              # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos
-                set -e
+              # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github
-                TEMPDIR=$(mktemp -d)
+              git clone --branch development --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
+              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 
-                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=development -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+              echo "Starting Stage 1 - Jenkinsfile update"
-                # Stage 1 - Jenkinsfile update
+              if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
-                if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
+                mkdir -p ${TEMPDIR}/repo
-                  mkdir -p ${TEMPDIR}/repo
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                  git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                cd ${TEMPDIR}/repo/${LS_REPO}
-                  cd ${TEMPDIR}/repo/${LS_REPO}
+                git checkout -f development
-                  git checkout -f development
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
-                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
+                git add Jenkinsfile
-                  git add Jenkinsfile
+                git commit -m 'Bot Updating Templated Files'
-                  git commit -m 'Bot Updating Templated Files'
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                  echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
-                  echo "Updating Jenkinsfile"
+                rm -Rf ${TEMPDIR}
-                  rm -Rf ${TEMPDIR}
+                exit 0
-                  exit 0
+              else
-                else
+                echo "Jenkinsfile is up to date."
-                  echo "Jenkinsfile is up to date."
+              fi
              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}"
                fi
-                # Stage 2 - Delete old templates
+              done
-                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"
+              if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then
-                for i in ${OLD_TEMPLATES}; do
+                mkdir -p ${TEMPDIR}/repo
-                  if [[ -f "${i}" ]]; then
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                    TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
+                cd ${TEMPDIR}/repo/${LS_REPO}
-                  fi
+                git checkout -f development
                for i in ${TEMPLATES_TO_DELETE}; do
                  git rm "${i}"
                done
-                if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then
+                git commit -m 'Bot Updating Templated Files'
-                  mkdir -p ${TEMPDIR}/repo
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
-                  git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
-                  cd ${TEMPDIR}/repo/${LS_REPO}
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                  git checkout -f development
+                echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit"
-                  for i in ${TEMPLATES_TO_DELETE}; do
+                rm -Rf ${TEMPDIR}
-                    git rm "${i}"
+                exit 0
-                  done
+              else
-                  git commit -m 'Bot Updating Templated Files'
+                echo "No templates to delete"
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+              fi
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+              echo "Starting Stage 3 - Update templates"
-                  echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
-                  echo "Deleting old and deprecated templates"
+              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
-                  rm -Rf ${TEMPDIR}
+              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
-                  exit 0
+              if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then
-                else
+                mkdir -p ${TEMPDIR}/repo
-                  echo "No templates to delete"
+                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
-                fi
+                cd ${TEMPDIR}/repo/${LS_REPO}
-                # Stage 3 - Update templates
+                git checkout -f development
                CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
-                NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
-                if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
-                  mkdir -p ${TEMPDIR}/repo
+                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
-                  git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
+                cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
-                  cd ${TEMPDIR}/repo/${LS_REPO}
+                cd ${TEMPDIR}/repo/${LS_REPO}/
-                  git checkout -f development
+                if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
-                  cd ${TEMPDIR}/docker-${CONTAINER_NAME}
+                  echo ".jenkins-external" >> .gitignore
-                  mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
+                  git add .gitignore
-                  mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
+                fi
-                  cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
+                git add readme-vars.yml ${TEMPLATED_FILES}
-                  cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
+                git commit -m 'Bot Updating Templated Files'
-                  cd ${TEMPDIR}/repo/${LS_REPO}/
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
-                  if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
-                    echo ".jenkins-external" >> .gitignore
+                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                    git add .gitignore
+                echo "Updating templates and exiting build, new one will trigger based on commit"
-                  fi
+                rm -Rf ${TEMPDIR}
-                  git add readme-vars.yml ${TEMPLATED_FILES}
+                exit 0
-                  git commit -m 'Bot Updating Templated Files'
+              else
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+                echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+                echo "No templates to update"
-                  echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+              fi
              echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub"
              mkdir -p ${TEMPDIR}/docs
              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 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 --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}" == "${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/
                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
                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
                else
-                  echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                  git add unraid/${CONTAINER_NAME}.xml
                  git commit -m 'Bot Updating Unraid Template'
                fi
-                mkdir -p ${TEMPDIR}/docs
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase
-                git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} || \
-                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
+                  (MAXWAIT="10" && echo "Push to unraid templates failed, trying again in ${MAXWAIT} seconds" && \
-                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
+                  sleep $((RANDOM % MAXWAIT)) && \
-                  cd ${TEMPDIR}/docs/docker-documentation
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \
-                  GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH})
-                  git add docs/images/docker-${CONTAINER_NAME}.md
+              else
-                  git commit -m 'Bot Updating Documentation'
+                echo "No updates to Unraid template needed, skipping"
-                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}
+              fi
-                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}
+              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
-                mkdir -p ${TEMPDIR}/unraid
+                if curl -s https://hub.docker.com/v2/namespaces/${DOCKERHUB_IMAGE%%/*}/repositories/${DOCKERHUB_IMAGE##*/}/tags | jq -r '.message' | grep -q 404; then
-                git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
+                  echo "Docker Hub endpoint doesn't exist. Creating endpoint first."
-                git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
+                  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')
                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}" == "${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
                  cd ${TEMPDIR}/unraid/templates/
                  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; 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
                    git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
                    git commit -m 'Bot Moving Deprecated Unraid Template' || :
                  else
                    cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                    git add unraid/${CONTAINER_NAME}.xml
                    git commit -m 'Bot Updating Unraid Template'
                  fi
                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}
                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH}
                fi
                # Stage 4 - Sync Readme to Docker Hub
                if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then
                  if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 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
                  DH_TOKEN=$(curl -d '{"username":"'${DOCKERUSER}'", "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 \
+                    -X POST \
-                    -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \
+                    -d '{"name":"'${DOCKERHUB_IMAGE##*/}'", "namespace":"'${DOCKERHUB_IMAGE%%/*}'"}' \
-                    https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || :
+                    https://hub.docker.com/v2/repositories/ || :
                else
                  echo "Not the default Github branch. Skipping readme sync to Docker Hub."
                fi
-                rm -Rf ${TEMPDIR}'''
+                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')
-          script{
+                curl -s \
-            env.FILES_UPDATED = sh(
+                  -H "Authorization: JWT ${DH_TOKEN}" \
-              script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''',
+                  -H "Content-Type: application/json" \
-              returnStdout: true).trim()
+                  -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{
          env.FILES_UPDATED = sh(
            script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''',
            returnStdout: true).trim()
        }
      }
    }
@@ -456,23 +502,27 @@ pipeline {
      }
    }
    /* #######################
-           GitLab Mirroring
+       GitLab Mirroring and Quay.io Repo Visibility
       ####################### */
-    // Ping into Gitlab to mirror this repo and have a registry endpoint
+    // Ping into Gitlab to mirror this repo and have a registry endpoint & mark this repo on Quay.io as public
-    stage("GitLab Mirror"){
+    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}',\
+          -d '{"namespace_id":'${GITLAB_NAMESPACE}',\
-             "name":"'${LS_REPO}'",
+            "name":"'${LS_REPO}'",
-             "mirror":true,\
+            "mirror":true,\
-             "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
+            "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\
-             "issues_access_level":"disabled",\
+            "issues_access_level":"disabled",\
-             "merge_requests_access_level":"disabled",\
+            "merge_requests_access_level":"disabled",\
-             "repository_access_level":"enabled",\
+            "repository_access_level":"enabled",\
-             "visibility":"public"}' '''
+            "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"}' ||: '''
      } 
    }
    /* ###############
@@ -503,6 +553,7 @@ 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=false --sbom=false \
          --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
      }
    }
@@ -534,6 +585,7 @@ 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=false --sbom=false \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
          }
        }
@@ -562,9 +614,10 @@ 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=false --sbom=false \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
            sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
-            retry(5) {
+            retry_backoff(5,5) {
              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
            }
            sh '''#! /bin/bash
@@ -588,7 +641,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}
@@ -676,18 +729,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=\"development\" \
                -e PORT=\"${CI_PORT}\" \
                -e SSL=\"${CI_SSL}\" \
                -e BASE=\"${DIST_IMAGE}\" \
@@ -697,6 +759,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'''
        }
@@ -713,12 +776,6 @@ pipeline {
      }
      steps {
        withCredentials([
          [
            $class: 'UsernamePasswordMultiBinding',
            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
            usernameVariable: 'DOCKERUSER',
            passwordVariable: 'DOCKERPASS'
          ],
          [
            $class: 'UsernamePasswordMultiBinding',
            credentialsId: 'Quay.io-Robot',
@@ -726,10 +783,10 @@ pipeline {
            passwordVariable: 'QUAYPASS'
          ]
        ]) {
-          retry(5) {
+          retry_backoff(5,5) {
            sh '''#! /bin/bash
                  set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
@@ -744,7 +801,7 @@ pipeline {
                    docker push ${PUSHIMAGE}:${META_TAG}
                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
                    if [ -n "${SEMVER}" ]; then
-                     docker push ${PUSHIMAGE}:${SEMVER}
+                      docker push ${PUSHIMAGE}:${SEMVER}
                    fi
                  done
               '''
@@ -760,12 +817,6 @@ pipeline {
      }
      steps {
        withCredentials([
          [
            $class: 'UsernamePasswordMultiBinding',
            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
            usernameVariable: 'DOCKERUSER',
            passwordVariable: 'DOCKERPASS'
          ],
          [
            $class: 'UsernamePasswordMultiBinding',
            credentialsId: 'Quay.io-Robot',
@@ -773,15 +824,15 @@ pipeline {
            passwordVariable: 'QUAYPASS'
          ]
        ]) {
-          retry(5) {
+          retry_backoff(5,5) {
            sh '''#! /bin/bash
                  set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                  if [ "${CI}" == "false" ]; then
-                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                  fi
                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
@@ -805,35 +856,13 @@ pipeline {
                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:development || :
+                  done
-                    docker manifest create ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm64v8-development
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                    docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm64v8-development --os linux --arch arm64 --variant v8
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm64v8-development
-                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                    docker 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 buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${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-development")
                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-development || :
                      docker manifest create ${MANIFESTIMAGE}:arm32v7-development ${MANIFESTIMAGE}:amd64-development
                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-development
                    fi
                    docker manifest push --purge ${MANIFESTIMAGE}:development
                    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
                  done
               '''
@@ -858,7 +887,7 @@ pipeline {
             "object": "'${COMMIT_SHA}'",\
             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to development",\
             "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}/commits/${EXT_RELEASE_CLEAN} | jq '.commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
@@ -990,18 +1019,53 @@ 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{
-        else if (currentBuild.currentResult == "SUCCESS"){
+          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,\
+            if (env.GITHUBIMAGE =~ /lspipepr/){
-                 "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"}],\
+              env.JOB_WEBHOOK_STATUS='Success'
-                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
+              env.JOB_WEBHOOK_COLOUR=3957028
-        }
+              env.JOB_WEBHOOK_FOOTER='PR Build'
-        else {
+            }else if (env.GITHUBIMAGE =~ /lsiodev/){
-          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,\
+              env.JOB_WEBHOOK_STATUS='Success'
-                 "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"}],\
+              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} '''
        }
      }
@@ -1019,3 +1083,20 @@ EOF
    }
  }
 }
 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
@@ -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)
@@ -37,7 +37,7 @@ Find us at:
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall)
 [![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-heimdall%2Fjob%2Fdevelopment%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/)
-[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fheimdall%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/heimdall/latest/index.html)
+[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fheimdall%2Fdevelopment%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/heimdall/development/index.html)
 [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.
@@ -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.
@@ -267,7 +266,8 @@ Below are the instructions for updating containers:
 ### 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
@@ -292,6 +292,9 @@ 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.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -6,7 +6,6 @@ external_type: github_commit
 release_type: prerelease
 release_tag: development
 ls_branch: development
 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_DOCKERENV=''
-  - CI_AUTH='user:password'
+  - CI_AUTH=''
  - CI_WEBPATH=''
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,248 +1,251 @@
-NAME                                VERSION                TYPE         
+NAME                                VERSION                TYPE           
-Hidden Input                        1, 0, 0, 0             dotnet        
+Hidden Input                        1, 0, 0, 0             dotnet          
-alpine-baselayout                   3.4.3-r2               apk           
+alpine-baselayout                   3.6.5-r0               apk             
-alpine-baselayout-data              3.4.3-r2               apk           
+alpine-baselayout-data              3.6.5-r0               apk             
-alpine-keys                         2.4-r1                 apk           
+alpine-keys                         2.4-r1                 apk             
-alpine-release                      3.19.1-r0              apk           
+alpine-release                      3.20.3-r0              apk             
-apache2-utils                       2.4.58-r1              apk           
+apache2-utils                       2.4.62-r0              apk             
-apk-tools                           2.14.0-r5              apk           
+apk-tools                           2.14.4-r0              apk             
-apr                                 1.7.4-r0               apk           
+apr                                 1.7.5-r0               apk             
-apr-util                            1.6.3-r1               apk           
+apr-util                            1.6.3-r1               apk             
-argon2-libs                         20190702-r5            apk           
+argon2-libs                         20190702-r5            apk             
-aws/aws-crt-php                     v1.2.4                 php-composer  
+aws/aws-crt-php                     v1.2.4                 php-composer    
-aws/aws-sdk-php                     3.299.1                php-composer  
+aws/aws-sdk-php                     3.299.1                php-composer    
-barryvdh/laravel-ide-helper         v2.15.1                php-composer  
+barryvdh/laravel-ide-helper         v2.15.1                php-composer    
-barryvdh/reflection-docblock        v2.1.1                 php-composer  
+barryvdh/reflection-docblock        v2.1.1                 php-composer    
-bash                                5.2.21-r0              apk           
+bash                                5.2.26-r0              apk             
-brick/math                          0.11.0                 php-composer  
+brick/math                          0.11.0                 php-composer    
-brotli-libs                         1.1.0-r1               apk           
+brotli-libs                         1.1.0-r2               apk             
-busybox                             1.36.1-r15             apk           
+busybox                             1.36.1-r29             apk             
-busybox-binsh                       1.36.1-r15             apk           
+busybox-binsh                       1.36.1-r29             apk             
-c-ares                              1.24.0-r1              apk           
+c-ares                              1.33.1-r0              apk             
-ca-certificates                     20230506-r0            apk           
+ca-certificates                     20240705-r0            apk             
-ca-certificates-bundle              20230506-r0            apk           
+ca-certificates-bundle              20240705-r0            apk             
-carbonphp/carbon-doctrine-types     2.1.0                  php-composer  
+carbonphp/carbon-doctrine-types     2.1.0                  php-composer    
-clue/stream-filter                  v1.7.0                 php-composer  
+catatonit                           0.2.0-r0               apk             
-composer                            2.7.1                  binary        
+clue/stream-filter                  v1.7.0                 php-composer    
-composer/class-map-generator        1.1.0                  php-composer  
+composer                            2.8.1                  binary          
-composer/pcre                       3.1.1                  php-composer  
+composer/class-map-generator        1.1.0                  php-composer    
-coreutils                           9.4-r2                 apk           
+composer/pcre                       3.1.1                  php-composer    
-coreutils-env                       9.4-r2                 apk           
+coreutils                           9.5-r1                 apk             
-coreutils-fmt                       9.4-r2                 apk           
+coreutils-env                       9.5-r1                 apk             
-coreutils-sha512sum                 9.4-r2                 apk           
+coreutils-fmt                       9.5-r1                 apk             
-curl                                8.5.0-r0               apk           
+coreutils-sha512sum                 9.5-r1                 apk             
-dflydev/dot-access-data             v3.0.2                 php-composer  
+curl                                8.9.1-r2               apk             
-doctrine/cache                      2.2.0                  php-composer  
+dflydev/dot-access-data             v3.0.2                 php-composer    
-doctrine/dbal                       3.8.2                  php-composer  
+doctrine/cache                      2.2.0                  php-composer    
-doctrine/deprecations               1.1.3                  php-composer  
+doctrine/dbal                       3.8.2                  php-composer    
-doctrine/event-manager              2.0.0                  php-composer  
+doctrine/deprecations               1.1.3                  php-composer    
-doctrine/inflector                  2.0.9                  php-composer  
+doctrine/event-manager              2.0.0                  php-composer    
-doctrine/instantiator               2.0.0                  php-composer  
+doctrine/inflector                  2.0.9                  php-composer    
-doctrine/lexer                      3.0.1                  php-composer  
+doctrine/instantiator               2.0.0                  php-composer    
-dragonmantank/cron-expression       v3.3.3                 php-composer  
+doctrine/lexer                      3.0.1                  php-composer    
-egulias/email-validator             4.0.2                  php-composer  
+dragonmantank/cron-expression       v3.3.3                 php-composer    
-fakerphp/faker                      v1.23.1                php-composer  
+egulias/email-validator             4.0.2                  php-composer    
-filp/whoops                         2.15.4                 php-composer  
+fakerphp/faker                      v1.23.1                php-composer    
-fruitcake/php-cors                  v1.3.0                 php-composer  
+filp/whoops                         2.15.4                 php-composer    
-git                                 2.43.0-r0              apk           
+findutils                           4.9.0-r5               apk             
-graham-campbell/bounded-cache       v2.2.0                 php-composer  
+fruitcake/php-cors                  v1.3.0                 php-composer    
-graham-campbell/github              v12.4.0                php-composer  
+git                                 2.45.2-r0              apk             
-graham-campbell/manager             v5.1.0                 php-composer  
+git-init-template                   2.45.2-r0              apk             
-graham-campbell/result-type         v1.1.2                 php-composer  
+graham-campbell/bounded-cache       v2.2.0                 php-composer    
-guzzlehttp/guzzle                   7.8.1                  php-composer  
+graham-campbell/github              v12.4.0                php-composer    
-guzzlehttp/promises                 2.0.2                  php-composer  
+graham-campbell/manager             v5.1.0                 php-composer    
-guzzlehttp/psr7                     2.6.2                  php-composer  
+graham-campbell/result-type         v1.1.2                 php-composer    
-guzzlehttp/uri-template             v1.0.3                 php-composer  
+guzzlehttp/guzzle                   7.8.1                  php-composer    
-hamcrest/hamcrest-php               v2.0.1                 php-composer  
+guzzlehttp/promises                 2.0.2                  php-composer    
-hiredis                             1.2.0-r0               apk           
+guzzlehttp/psr7                     2.6.2                  php-composer    
-icu-data-en                         74.1-r0                apk           
+guzzlehttp/uri-template             v1.0.3                 php-composer    
-icu-libs                            74.1-r0                apk           
+hamcrest/hamcrest-php               v2.0.1                 php-composer    
-jq                                  1.7.1-r0               apk           
+icu-data-en                         74.2-r0                apk             
-knplabs/github-api                  v3.13.0                php-composer  
+icu-libs                            74.2-r0                apk             
-laravel/framework                   v10.44.0               php-composer  
+jq                                  1.7.1-r0               apk             
-laravel/prompts                     v0.1.15                php-composer  
+knplabs/github-api                  v3.13.0                php-composer    
-laravel/serializable-closure        v1.3.3                 php-composer  
+laravel/framework                   v10.44.0               php-composer    
-laravel/tinker                      v2.9.0                 php-composer  
+laravel/prompts                     v0.1.15                php-composer    
-laravel/ui                          v4.4.0                 php-composer  
+laravel/serializable-closure        v1.3.3                 php-composer    
-laravelcollective/html              v6.4.1                 php-composer  
+laravel/tinker                      v2.9.0                 php-composer    
-lcobucci/jwt                        5.2.0                  php-composer  
+laravel/ui                          v4.4.0                 php-composer    
-league/commonmark                   2.4.2                  php-composer  
+laravelcollective/html              v6.4.1                 php-composer    
-league/config                       v1.2.0                 php-composer  
+lcobucci/jwt                        5.2.0                  php-composer    
-league/flysystem                    3.24.0                 php-composer  
+league/commonmark                   2.4.2                  php-composer    
-league/flysystem-aws-s3-v3          3.24.0                 php-composer  
+league/config                       v1.2.0                 php-composer    
-league/flysystem-local              3.23.1                 php-composer  
+league/flysystem                    3.24.0                 php-composer    
-league/mime-type-detection          1.15.0                 php-composer  
+league/flysystem-aws-s3-v3          3.24.0                 php-composer    
-libacl                              2.3.1-r4               apk           
+league/flysystem-local              3.23.1                 php-composer    
-libattr                             2.5.1-r5               apk           
+league/mime-type-detection          1.15.0                 php-composer    
-libbsd                              0.11.7-r3              apk           
+libacl                              2.3.2-r0               apk             
-libbz2                              1.0.8-r6               apk           
+libattr                             2.5.2-r0               apk             
-libc-utils                          0.7.2-r5               apk           
+libbsd                              0.12.2-r0              apk             
-libcrypto3                          3.1.4-r5               apk           
+libbz2                              1.0.8-r6               apk             
-libcurl                             8.5.0-r0               apk           
+libcrypto3                          3.3.2-r1               apk             
-libedit                             20230828.3.1-r3        apk           
+libcurl                             8.9.1-r2               apk             
-libexpat                            2.6.0-r0               apk           
+libedit                             20240517.3.1-r0        apk             
-libgcc                              13.2.1_git20231014-r0  apk           
+libexpat                            2.6.3-r0               apk             
-libidn2                             2.3.4-r4               apk           
+libgcc                              13.2.1_git20240309-r0  apk             
-libintl                             0.22.3-r0              apk           
+libidn2                             2.3.7-r0               apk             
-libmd                               1.1.0-r0               apk           
+libintl                             0.22.5-r0              apk             
-libncursesw                         6.4_p20231125-r0       apk           
+libmd                               1.1.0-r0               apk             
-libpq                               16.2-r0                apk           
+libncursesw                         6.4_p20240420-r1       apk             
-libproc2                            4.0.4-r0               apk           
+libpq                               16.4-r0                apk             
-libssl3                             3.1.4-r5               apk           
+libproc2                            4.0.4-r0               apk             
-libstdc++                           13.2.1_git20231014-r0  apk           
+libpsl                              0.21.5-r1              apk             
-libunistring                        1.1-r2                 apk           
+libssl3                             3.3.2-r1               apk             
-libuuid                             2.39.3-r0              apk           
+libstdc++                           13.2.1_git20240309-r0  apk             
-libxml2                             2.11.7-r0              apk           
+libunistring                        1.2-r0                 apk             
-libzip                              1.10.1-r0              apk           
+libuuid                             2.40.1-r1              apk             
-linux-pam                           1.5.3-r7               apk           
+libxml2                             2.12.7-r0              apk             
-logrotate                           3.21.0-r1              apk           
+libzip                              1.10.1-r0              apk             
-mockery/mockery                     1.6.7                  php-composer  
+linux-pam                           1.6.0-r0               apk             
-monolog/monolog                     3.5.0                  php-composer  
+logrotate                           3.21.0-r1              apk             
-mtdowling/jmespath.php              2.7.0                  php-composer  
+mockery/mockery                     1.6.7                  php-composer    
-musl                                1.2.4_git20230717-r4   apk           
+monolog/monolog                     3.5.0                  php-composer    
-musl-utils                          1.2.4_git20230717-r4   apk           
+mtdowling/jmespath.php              2.7.0                  php-composer    
-myclabs/deep-copy                   1.11.1                 php-composer  
+musl                                1.2.5-r0               apk             
-nano                                7.2-r1                 apk           
+musl-utils                          1.2.5-r0               apk             
-ncurses-terminfo-base               6.4_p20231125-r0       apk           
+myclabs/deep-copy                   1.11.1                 php-composer    
-nesbot/carbon                       2.72.3                 php-composer  
+nano                                8.0-r0                 apk             
-netcat-openbsd                      1.226-r0               apk           
+ncurses-terminfo-base               6.4_p20240420-r1       apk             
-nette/schema                        v1.3.0                 php-composer  
+nesbot/carbon                       2.72.3                 php-composer    
-nette/utils                         v4.0.4                 php-composer  
+netcat-openbsd                      1.226-r0               apk             
-nghttp2-libs                        1.58.0-r0              apk           
+nette/schema                        v1.3.0                 php-composer    
-nginx                               1.24.0-r15             apk           
+nette/utils                         v4.0.4                 php-composer    
-nikic/php-parser                    v5.0.0                 php-composer  
+nghttp2-libs                        1.62.1-r0              apk             
-nunomaduro/collision                v6.4.0                 php-composer  
+nginx                               1.26.2-r0              apk             
-nunomaduro/termwind                 v1.15.1                php-composer  
+nikic/php-parser                    v5.0.0                 php-composer    
-oniguruma                           6.9.9-r0               apk           
+nunomaduro/collision                v6.4.0                 php-composer    
-openssl                             3.1.4-r5               apk           
+nunomaduro/termwind                 v1.15.1                php-composer    
-pcre                                8.45-r3                apk           
+oniguruma                           6.9.9-r0               apk             
-pcre2                               10.42-r2               apk           
+openssl                             3.3.2-r1               apk             
-phar-io/manifest                    2.0.3                  php-composer  
+pcre                                8.45-r3                apk             
-phar-io/version                     3.2.1                  php-composer  
+pcre2                               10.43-r0               apk             
-php-http/cache-plugin               1.8.1                  php-composer  
+phar-io/manifest                    2.0.3                  php-composer    
-php-http/client-common              2.7.1                  php-composer  
+phar-io/version                     3.2.1                  php-composer    
-php-http/discovery                  1.19.2                 php-composer  
+php-http/cache-plugin               1.8.1                  php-composer    
-php-http/httplug                    2.4.0                  php-composer  
+php-http/client-common              2.7.1                  php-composer    
-php-http/message                    1.16.0                 php-composer  
+php-http/discovery                  1.19.2                 php-composer    
-php-http/message-factory            1.1.0                  php-composer  
+php-http/httplug                    2.4.0                  php-composer    
-php-http/multipart-stream-builder   1.3.0                  php-composer  
+php-http/message                    1.16.0                 php-composer    
-php-http/promise                    1.3.0                  php-composer  
+php-http/message-factory            1.1.0                  php-composer    
-php83                               8.3.3-r0               apk           
+php-http/multipart-stream-builder   1.3.0                  php-composer    
-php83-common                        8.3.3-r0               apk           
+php-http/promise                    1.3.0                  php-composer    
-php83-ctype                         8.3.3-r0               apk           
+php83                               8.3.13-r0              apk             
-php83-curl                          8.3.3-r0               apk           
+php83-common                        8.3.13-r0              apk             
-php83-dom                           8.3.3-r0               apk           
+php83-ctype                         8.3.13-r0              apk             
-php83-fileinfo                      8.3.3-r0               apk           
+php83-curl                          8.3.13-r0              apk             
-php83-fpm                           8.3.3-r0               apk           
+php83-dom                           8.3.13-r0              apk             
-php83-iconv                         8.3.3-r0               apk           
+php83-fileinfo                      8.3.13-r0              apk             
-php83-intl                          8.3.3-r0               apk           
+php83-fpm                           8.3.13-r0              apk             
-php83-mbstring                      8.3.3-r0               apk           
+php83-iconv                         8.3.13-r0              apk             
-php83-mysqlnd                       8.3.3-r0               apk           
+php83-intl                          8.3.13-r0              apk             
-php83-openssl                       8.3.3-r0               apk           
+php83-mbstring                      8.3.13-r0              apk             
-php83-pdo                           8.3.3-r0               apk           
+php83-mysqlnd                       8.3.13-r0              apk             
-php83-pdo_mysql                     8.3.3-r0               apk           
+php83-opcache                       8.3.13-r0              apk             
-php83-pdo_pgsql                     8.3.3-r0               apk           
+php83-openssl                       8.3.13-r0              apk             
-php83-pdo_sqlite                    8.3.3-r0               apk           
+php83-pdo                           8.3.13-r0              apk             
-php83-phar                          8.3.3-r0               apk           
+php83-pdo_mysql                     8.3.13-r0              apk             
-php83-session                       8.3.3-r0               apk           
+php83-pdo_pgsql                     8.3.13-r0              apk             
-php83-simplexml                     8.3.3-r0               apk           
+php83-pdo_sqlite                    8.3.13-r0              apk             
-php83-tokenizer                     8.3.3-r0               apk           
+php83-phar                          8.3.13-r0              apk             
-php83-xml                           8.3.3-r0               apk           
+php83-session                       8.3.13-r0              apk             
-php83-xmlwriter                     8.3.3-r0               apk           
+php83-simplexml                     8.3.13-r0              apk             
-php83-zip                           8.3.3-r0               apk           
+php83-tokenizer                     8.3.13-r0              apk             
-phpdocumentor/reflection-common     2.2.0                  php-composer  
+php83-xml                           8.3.13-r0              apk             
-phpdocumentor/type-resolver         1.8.0                  php-composer  
+php83-xmlwriter                     8.3.13-r0              apk             
-phpoption/phpoption                 1.9.2                  php-composer  
+php83-zip                           8.3.13-r0              apk             
-phpstan/phpdoc-parser               1.25.0                 php-composer  
+phpdocumentor/reflection-common     2.2.0                  php-composer    
-phpunit/php-code-coverage           9.2.30                 php-composer  
+phpdocumentor/type-resolver         1.8.0                  php-composer    
-phpunit/php-file-iterator           3.0.6                  php-composer  
+phpoption/phpoption                 1.9.2                  php-composer    
-phpunit/php-invoker                 3.1.1                  php-composer  
+phpstan/phpdoc-parser               1.25.0                 php-composer    
-phpunit/php-text-template           2.0.4                  php-composer  
+phpunit/php-code-coverage           9.2.30                 php-composer    
-phpunit/php-timer                   5.0.3                  php-composer  
+phpunit/php-file-iterator           3.0.6                  php-composer    
-phpunit/phpunit                     9.6.16                 php-composer  
+phpunit/php-invoker                 3.1.1                  php-composer    
-popt                                1.19-r3                apk           
+phpunit/php-text-template           2.0.4                  php-composer    
-procps-ng                           4.0.4-r0               apk           
+phpunit/php-timer                   5.0.3                  php-composer    
-psr/cache                           3.0.0                  php-composer  
+phpunit/phpunit                     9.6.16                 php-composer    
-psr/clock                           1.0.0                  php-composer  
+popt                                1.19-r3                apk             
-psr/container                       2.0.2                  php-composer  
+procps-ng                           4.0.4-r0               apk             
-psr/event-dispatcher                1.0.0                  php-composer  
+psr/cache                           3.0.0                  php-composer    
-psr/http-client                     1.0.3                  php-composer  
+psr/clock                           1.0.0                  php-composer    
-psr/http-factory                    1.0.2                  php-composer  
+psr/container                       2.0.2                  php-composer    
-psr/http-message                    2.0                    php-composer  
+psr/event-dispatcher                1.0.0                  php-composer    
-psr/log                             3.0.0                  php-composer  
+psr/http-client                     1.0.3                  php-composer    
-psr/simple-cache                    3.0.0                  php-composer  
+psr/http-factory                    1.0.2                  php-composer    
-psy/psysh                           v0.12.0                php-composer  
+psr/http-message                    2.0                    php-composer    
-ralouphie/getallheaders             3.0.3                  php-composer  
+psr/log                             3.0.0                  php-composer    
-ramsey/collection                   2.0.0                  php-composer  
+psr/simple-cache                    3.0.0                  php-composer    
-ramsey/uuid                         4.7.5                  php-composer  
+psy/psysh                           v0.12.0                php-composer    
-readline                            8.2.1-r2               apk           
+ralouphie/getallheaders             3.0.3                  php-composer    
-scanelf                             1.3.7-r2               apk           
+ramsey/collection                   2.0.0                  php-composer    
-sebastian/cli-parser                1.0.1                  php-composer  
+ramsey/uuid                         4.7.5                  php-composer    
-sebastian/code-unit                 1.0.8                  php-composer  
+readline                            8.2.10-r0              apk             
-sebastian/code-unit-reverse-lookup  2.0.3                  php-composer  
+scanelf                             1.3.7-r2               apk             
-sebastian/comparator                4.0.8                  php-composer  
+sebastian/cli-parser                1.0.1                  php-composer    
-sebastian/complexity                2.0.3                  php-composer  
+sebastian/code-unit                 1.0.8                  php-composer    
-sebastian/diff                      4.0.5                  php-composer  
+sebastian/code-unit-reverse-lookup  2.0.3                  php-composer    
-sebastian/environment               5.1.5                  php-composer  
+sebastian/comparator                4.0.8                  php-composer    
-sebastian/exporter                  4.0.5                  php-composer  
+sebastian/complexity                2.0.3                  php-composer    
-sebastian/global-state              5.0.6                  php-composer  
+sebastian/diff                      4.0.5                  php-composer    
-sebastian/lines-of-code             1.0.4                  php-composer  
+sebastian/environment               5.1.5                  php-composer    
-sebastian/object-enumerator         4.0.4                  php-composer  
+sebastian/exporter                  4.0.5                  php-composer    
-sebastian/object-reflector          2.0.4                  php-composer  
+sebastian/global-state              5.0.6                  php-composer    
-sebastian/recursion-context         4.0.5                  php-composer  
+sebastian/lines-of-code             1.0.4                  php-composer    
-sebastian/resource-operations       3.0.3                  php-composer  
+sebastian/object-enumerator         4.0.4                  php-composer    
-sebastian/type                      3.2.1                  php-composer  
+sebastian/object-reflector          2.0.4                  php-composer    
-sebastian/version                   3.0.2                  php-composer  
+sebastian/recursion-context         4.0.5                  php-composer    
-shadow                              4.14.2-r0              apk           
+sebastian/resource-operations       3.0.3                  php-composer    
-skalibs                             2.14.0.1-r0            apk           
+sebastian/type                      3.2.1                  php-composer    
-spatie/backtrace                    1.5.3                  php-composer  
+sebastian/version                   3.0.2                  php-composer    
-spatie/flare-client-php             1.4.4                  php-composer  
+shadow                              4.15.1-r0              apk             
-spatie/ignition                     1.12.0                 php-composer  
+skalibs                             2.14.1.1-r0            apk             
-spatie/laravel-ignition             2.4.2                  php-composer  
+spatie/backtrace                    1.5.3                  php-composer    
-sqlite-libs                         3.44.2-r0              apk           
+spatie/flare-client-php             1.4.4                  php-composer    
-squizlabs/php_codesniffer           3.9.0                  php-composer  
+spatie/ignition                     1.12.0                 php-composer    
-ssl_client                          1.36.1-r15             apk           
+spatie/laravel-ignition             2.4.2                  php-composer    
-symfony/cache                       v6.4.3                 php-composer  
+sqlite-libs                         3.45.3-r1              apk             
-symfony/cache-contracts             v3.4.0                 php-composer  
+squizlabs/php_codesniffer           3.9.0                  php-composer    
-symfony/console                     v6.4.3                 php-composer  
+ssl_client                          1.36.1-r29             apk             
-symfony/css-selector                v7.0.3                 php-composer  
+symfony/cache                       v6.4.3                 php-composer    
-symfony/deprecation-contracts       v3.4.0                 php-composer  
+symfony/cache-contracts             v3.4.0                 php-composer    
-symfony/error-handler               v6.4.3                 php-composer  
+symfony/console                     v6.4.3                 php-composer    
-symfony/event-dispatcher            v7.0.3                 php-composer  
+symfony/css-selector                v7.0.3                 php-composer    
-symfony/event-dispatcher-contracts  v3.4.0                 php-composer  
+symfony/deprecation-contracts       v3.4.0                 php-composer    
-symfony/finder                      v6.4.0                 php-composer  
+symfony/error-handler               v6.4.3                 php-composer    
-symfony/http-foundation             v6.4.3                 php-composer  
+symfony/event-dispatcher            v7.0.3                 php-composer    
-symfony/http-kernel                 v6.4.3                 php-composer  
+symfony/event-dispatcher-contracts  v3.4.0                 php-composer    
-symfony/mailer                      v6.4.3                 php-composer  
+symfony/finder                      v6.4.0                 php-composer    
-symfony/mime                        v6.4.3                 php-composer  
+symfony/http-foundation             v6.4.3                 php-composer    
-symfony/options-resolver            v7.0.0                 php-composer  
+symfony/http-kernel                 v6.4.3                 php-composer    
-symfony/polyfill-ctype              v1.29.0                php-composer  
+symfony/mailer                      v6.4.3                 php-composer    
-symfony/polyfill-intl-grapheme      v1.29.0                php-composer  
+symfony/mime                        v6.4.3                 php-composer    
-symfony/polyfill-intl-idn           v1.29.0                php-composer  
+symfony/options-resolver            v7.0.0                 php-composer    
-symfony/polyfill-intl-normalizer    v1.29.0                php-composer  
+symfony/polyfill-ctype              v1.29.0                php-composer    
-symfony/polyfill-mbstring           v1.29.0                php-composer  
+symfony/polyfill-intl-grapheme      v1.29.0                php-composer    
-symfony/polyfill-php72              v1.29.0                php-composer  
+symfony/polyfill-intl-idn           v1.29.0                php-composer    
-symfony/polyfill-php80              v1.29.0                php-composer  
+symfony/polyfill-intl-normalizer    v1.29.0                php-composer    
-symfony/polyfill-php83              v1.29.0                php-composer  
+symfony/polyfill-mbstring           v1.29.0                php-composer    
-symfony/polyfill-uuid               v1.29.0                php-composer  
+symfony/polyfill-php72              v1.29.0                php-composer    
-symfony/process                     v6.4.3                 php-composer  
+symfony/polyfill-php80              v1.29.0                php-composer    
-symfony/routing                     v6.4.3                 php-composer  
+symfony/polyfill-php83              v1.29.0                php-composer    
-symfony/service-contracts           v3.4.1                 php-composer  
+symfony/polyfill-uuid               v1.29.0                php-composer    
-symfony/string                      v7.0.3                 php-composer  
+symfony/process                     v6.4.3                 php-composer    
-symfony/thanks                      v1.2.10                php-composer  
+symfony/routing                     v6.4.3                 php-composer    
-symfony/translation                 v6.4.3                 php-composer  
+symfony/service-contracts           v3.4.1                 php-composer    
-symfony/translation-contracts       v3.4.1                 php-composer  
+symfony/string                      v7.0.3                 php-composer    
-symfony/uid                         v6.4.3                 php-composer  
+symfony/thanks                      v1.2.10                php-composer    
-symfony/var-dumper                  v6.4.3                 php-composer  
+symfony/translation                 v6.4.3                 php-composer    
-symfony/var-exporter                v7.0.3                 php-composer  
+symfony/translation-contracts       v3.4.1                 php-composer    
-symfony/yaml                        v6.4.3                 php-composer  
+symfony/uid                         v6.4.3                 php-composer    
-theseer/tokenizer                   1.2.2                  php-composer  
+symfony/var-dumper                  v6.4.3                 php-composer    
-tijsverkoyen/css-to-inline-styles   v2.2.7                 php-composer  
+symfony/var-exporter                v7.0.3                 php-composer    
-tzdata                              2024a-r0               apk           
+symfony/yaml                        v6.4.3                 php-composer    
-utmps-libs                          0.1.2.2-r0             apk           
+theseer/tokenizer                   1.2.2                  php-composer    
-vlucas/phpdotenv                    v5.6.0                 php-composer  
+tijsverkoyen/css-to-inline-styles   v2.2.7                 php-composer    
-voku/portable-ascii                 2.0.1                  php-composer  
+tzdata                              2024b-r0               apk             
-webmozart/assert                    1.11.0                 php-composer  
+utmps-libs                          0.1.2.2-r1             apk             
-xz-libs                             5.4.5-r0               apk           
+vlucas/phpdotenv                    v5.6.0                 php-composer    
-zlib                                1.3.1-r0               apk           
+voku/portable-ascii                 2.0.1                  php-composer    
-zstd-libs                           1.5.5-r8               apk           
+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
@@ -33,31 +33,21 @@ 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"}
 # optional parameters
 optional_block_1: false
 optional_block_1_items:
  - |
    Using tags, you can switch between the stable releases of Heimdall and the master branch. No tag is required for the latest stable release.
    Add the development tag,  if required,  to the linuxserver/heimdall line of the run/create command in the following format, linuxserver/heimdall:development
    The development tag will be the latest commit in the master branch of Heimdall.
    HOWEVER , USE THE DEVELOPMENT TAG AT YOUR OWN PERIL !!!!!!!!!
 # 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.
 # changelog
 changelogs:
  - { 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." }
--- 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/etc/s6-overlay/s6-rc.d/svc-queue/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-queue/run
@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 exec \
    s6-setuidgid abc php /app/www/artisan queue:work database --sleep=3 --tries=3
--- a/root/migrations/02-default-location
+++ b/root/migrations/02-default-location
@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 DEFAULT_CONF="/config/nginx/site-confs/default.conf"
 OLD_ROOT="root /var/www/localhost/heimdall/public;"
Author	SHA1	Message	Date
LinuxServer-CI	ce6b1284df	Bot Updating Package Versions	2024-11-01 18:36:41 +00:00
LinuxServer-CI	dd3a2c1436	Bot Updating Package Versions	2024-10-25 18:37:08 +00:00
LinuxServer-CI	8dfbfd407b	Bot Updating Templated Files	2024-10-04 18:36:08 +00:00
LinuxServer-CI	97b362c53b	Bot Updating Package Versions	2024-09-27 18:42:33 +00:00
LinuxServer-CI	dc819e40e2	Bot Updating Templated Files	2024-09-27 18:40:04 +00:00
LinuxServer-CI	481b5eeacb	Bot Updating Templated Files	2024-09-27 18:38:32 +00:00
LinuxServer-CI	43096092e1	Bot Updating Templated Files	2024-09-27 18:36:54 +00:00
LinuxServer-CI	3c1ed055ad	Bot Updating Package Versions	2024-09-20 18:36:24 +00:00
LinuxServer-CI	d2133e3a45	Bot Updating Package Versions	2024-09-13 18:38:51 +00:00
LinuxServer-CI	1ff5ea8b10	Bot Updating Package Versions	2024-09-06 18:36:25 +00:00
LinuxServer-CI	5c49302a39	Bot Updating Package Versions	2024-08-23 18:37:44 +00:00
LinuxServer-CI	e413bfa5c0	Bot Updating Templated Files	2024-08-23 18:35:24 +00:00
LinuxServer-CI	8c3587b7c3	Bot Updating Templated Files	2024-08-23 18:33:21 +00:00
LinuxServer-CI	91d6a63bcf	Bot Updating Package Versions	2024-08-16 18:34:21 +00:00
LinuxServer-CI	23752f9ba4	Bot Updating Package Versions	2024-08-09 18:36:03 +00:00
LinuxServer-CI	19c606439d	Bot Updating Package Versions	2024-08-02 18:33:43 +00:00
LinuxServer-CI	421a86103b	Bot Updating Package Versions	2024-07-26 18:32:25 +00:00
Eric Nemchik	740c467147	Merge pull request #154 from linuxserver/delete-default-conf-development Delete root/defaults/nginx/site-confs/default.conf.sample [development]	2024-07-19 16:35:09 -05:00
LinuxServer-CI	767cc6637f	Bot Updating Package Versions	2024-07-19 18:34:10 +00:00
Eric Nemchik	2835692143	Delete root/defaults/nginx/site-confs/default.conf.sample [development] redundant to base	2024-07-16 20:48:40 -05:00
LinuxServer-CI	b9c10d0c3f	Bot Updating Package Versions	2024-07-12 18:39:12 +00:00
LinuxServer-CI	3367ea93f0	Bot Updating Templated Files	2024-07-12 18:36:15 +00:00
LinuxServer-CI	ae633adcd2	Bot Updating Templated Files	2024-07-12 18:34:52 +00:00
LinuxServer-CI	aff35b0195	Bot Updating Package Versions	2024-07-05 18:32:36 +00:00
LinuxServer-CI	fd57557021	Bot Updating Package Versions	2024-06-28 09:07:21 +00:00
Roxedus	8e6a2394a6	Merge pull request #151 from linuxserver/development-3.20	2024-06-28 11:04:18 +02:00
thespad	ab650ac006	Add missing shellcheck format	2024-06-27 16:30:37 +01:00
thespad	3f23522949	Rebase to 3.20	2024-06-27 16:29:44 +01:00
LinuxServer-CI	ed36cb689e	Bot Updating Package Versions	2024-06-21 18:32:44 +00:00
LinuxServer-CI	645959d5a1	Bot Updating Package Versions	2024-06-14 18:34:10 +00:00
LinuxServer-CI	523d744f8a	Bot Updating Package Versions	2024-05-24 18:36:26 +00:00
LinuxServer-CI	49ec00127e	Bot Updating Templated Files	2024-05-24 18:33:50 +00:00
LinuxServer-CI	b8e058679e	Bot Updating Templated Files	2024-05-24 18:31:31 +00:00
LinuxServer-CI	6ebaf00cb6	Bot Updating Package Versions	2024-05-17 18:32:38 +00:00
LinuxServer-CI	9f0cb3aa38	Bot Updating Package Versions	2024-05-10 18:32:33 +00:00
LinuxServer-CI	e10521f93e	Bot Updating Templated Files	2024-05-10 18:30:01 +00:00
LinuxServer-CI	b25194e490	Bot Updating Package Versions	2024-05-03 18:35:31 +00:00
LinuxServer-CI	475c877c76	Bot Updating Templated Files	2024-05-03 18:32:54 +00:00
LinuxServer-CI	45367a03b6	Bot Updating Package Versions	2024-04-26 18:29:53 +00:00
LinuxServer-CI	2f3d7bdd94	Bot Updating Package Versions	2024-04-19 18:28:58 +00:00
LinuxServer-CI	7166a2b229	Bot Updating Package Versions	2024-04-12 18:29:01 +00:00
LinuxServer-CI	4ee9ea84b9	Bot Updating Package Versions	2024-04-05 18:29:23 +00:00
LinuxServer-CI	4d728e90a3	Bot Updating Package Versions	2024-03-29 18:28:46 +00:00
LinuxServer-CI	ed8c89fc22	Bot Updating Package Versions	2024-03-22 18:28:42 +00:00
LinuxServer-CI	b2078bfbf6	Bot Updating Package Versions	2024-03-15 18:33:43 +00:00
LinuxServer-CI	fff281c5b8	Bot Updating Templated Files	2024-03-15 18:30:38 +00:00
LinuxServer-CI	9aa3cce066	Bot Updating Package Versions	2024-03-08 13:37:16 +00:00
LinuxServer-CI	09b457bbd4	Bot Updating Templated Files	2024-03-08 13:34:17 +00:00
aptalca	13955c751d	Merge pull request #150 from linuxserver/development-parity Add opcache and clean up default site conf	2024-03-08 08:32:38 -05:00
aptalca	723df80461	Add opcache and clean up default site conf	2024-03-07 09:17:32 -05:00
LinuxServer-CI	3d0d91cad8	Bot Updating Package Versions	2024-03-01 18:30:52 +00:00
LinuxServer-CI	86015b2bb6	Bot Updating Templated Files	2024-02-23 18:32:34 +00:00
LinuxServer-CI	9d09f09b65	Bot Updating Templated Files	2024-02-23 18:29:08 +00:00