Bot Updating Package Versions

Delete root/defaults/nginx/site-confs/default.conf.sample [development]

.github/CONTRIBUTING.md

@@ -24,7 +24,7 @@
 ## Readme
 
 If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
-Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-heimdall/edit/master/readme-vars.yml).
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-heimdall/edit/development/readme-vars.yml).
 
 These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
 Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-heimdall)
@@ -105,17 +105,17 @@ docker build \
   -t linuxserver/heimdall:latest .
 ```
 
-The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
 
 ```bash
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
+docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
 ```
 
 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
 
 ## Update the changelog
 
-If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-heimdall/tree/master/root), add an entry to the changelog
+If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-heimdall/tree/development/root), add an entry to the changelog
 
 ```yml
 changelogs:

.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

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,7 +21,7 @@
 
 ------------------------------
 
- - [ ] I have read the [contributing](https://github.com/linuxserver/docker-heimdall/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
+ - [ ] I have read the [contributing](https://github.com/linuxserver/docker-heimdall/blob/development/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
 
 ------------------------------
 

.github/workflows/external_trigger.yml

@@ -4,26 +4,31 @@ on:
   workflow_dispatch:
 
 jobs:
-  external-trigger-master:
+  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/master'
+        if: github.ref == 'refs/heads/development'
+        env:
+          SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
         run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER }}" ]; then
+          printf "# External trigger for docker-heimdall\n\n" >> $GITHUB_STEP_SUMMARY
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER is set; skipping trigger. ****"
+          if grep -q "^heimdall_development" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
-            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER\` 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 master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER\". ****"
+          echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-          echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER\`" >> $GITHUB_STEP_SUMMARY
+          echo "> 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/releases/latest" | jq -r '. | .tag_name')
+          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
-            FAILURE_REASON="Can't retrieve external version for heimdall branch master"
+            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,
               "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
@@ -31,24 +36,42 @@ jobs:
             exit 1
           fi
           EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
-          echo "**** External version: ${EXT_RELEASE} ****"
+          echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
-          echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
+          echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
-          echo "**** Retrieving last pushed version ****"
           image="linuxserver/heimdall"
-          tag="latest"
+          tag="development"
           token=$(curl -sX GET \
             "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fheimdall%3Apull" \
             | jq -r '.token')
-            multidigest=$(curl -s \
+          multidigest=$(curl -s \
+            --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+            --header "Accept: application/vnd.oci.image.index.v1+json" \
+            --header "Authorization: Bearer ${token}" \
+            "https://ghcr.io/v2/${image}/manifests/${tag}")
+          if jq -e '.layers // empty' <<< "${multidigest}" >/dev/null 2>&1; then
+            # If there's a layer element it's a single-arch manifest so just get that digest
+            digest=$(jq -r '.config.digest' <<< "${multidigest}")
+          else
+            # Otherwise it's multi-arch or has manifest annotations
+            if jq -e '.manifests[]?.annotations // empty' <<< "${multidigest}" >/dev/null 2>&1; then
+              # Check for manifest annotations and delete if found
+              multidigest=$(jq 'del(.manifests[] | select(.annotations))' <<< "${multidigest}")
+            fi
+            if [[ $(jq '.manifests | length' <<< "${multidigest}") -gt 1 ]]; then
+              # If there's still more than one digest, it's multi-arch
+              multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}")
+            else
+              # Otherwise it's single arch
+              multidigest=$(jq -r ".manifests[].digest?" <<< "${multidigest}")
+            fi
+            if digest=$(curl -s \
               --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+              --header "Accept: application/vnd.oci.image.manifest.v1+json" \
               --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${tag}" \
+              "https://ghcr.io/v2/${image}/manifests/${multidigest}"); then
-              | jq -r 'first(.manifests[].digest)')
+              digest=$(jq -r '.config.digest' <<< "${digest}");
-            digest=$(curl -s \
+            fi
-              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+          fi
-              --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${multidigest}" \
-              | jq -r '.config.digest')
           image_info=$(curl -sL \
             --header "Authorization: Bearer ${token}" \
             "https://ghcr.io/v2/${image}/blobs/${digest}")
@@ -60,45 +83,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
-            FAILURE_REASON="Can't retrieve last pushed version for heimdall tag latest"
+            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/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          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/master/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 latest. 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

.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

.github/workflows/greetings.yml

@@ -9,5 +9,5 @@ jobs:
     - uses: actions/first-interaction@v1
       with:
         issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
-        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-heimdall/blob/master/.github/PULL_REQUEST_TEMPLATE.md)!'
+        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-heimdall/blob/development/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/package_trigger.yml

@@ -1,42 +0,0 @@
-name: Package Trigger Main
-
-on:
-  workflow_dispatch:
-
-jobs:
-  package-trigger-master:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3.1.0
-
-      - name: Package Trigger
-        if: github.ref == 'refs/heads/master'
-        run: |
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER is set; skipping trigger. ****"
-            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
-          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
-            echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
-            echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
-            exit 0
-          fi
-          echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER\". ****"
-          echo "Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER\`" >> $GITHUB_STEP_SUMMARY
-          response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/buildWithParameters?PACKAGE_CHECK=true \
-            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-          echo "**** Jenkins job queue url: ${response%$'\r'} ****"
-          echo "**** Sleeping 10 seconds until job starts ****"
-          sleep 10
-          buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-          buildurl="${buildurl%$'\r'}"
-          echo "**** Jenkins job build url: ${buildurl} ****"
-          echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
-          echo "**** Attempting to change the Jenkins job description ****"
-          curl -iX POST \
-            "${buildurl}submitDescription" \
-            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-            --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-            --data-urlencode "Submit=Submit"

.github/workflows/package_trigger_scheduler.yml

@@ -9,42 +9,92 @@ jobs:
   package-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
         with:
           fetch-depth: '0'
 
       - name: Package Trigger Scheduler
+        env:
+          SKIP_PACKAGE_TRIGGER: ${{ vars.SKIP_PACKAGE_TRIGGER }}
         run: |
-          echo "**** Branches found: ****"
+          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 ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/Jenkinsfile >/dev/null 2>&1; then
-                echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
+              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                triggered_branches="${triggered_branches}${br} "
+              echo "> No Jenkinsfile found. Branch is either deprecated or is an early dev branch." >> $GITHUB_STEP_SUMMARY
-                curl -iX POST \
+              skipped_branches="${skipped_branches}${br} "
-                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
+            elif [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
-                  -H "Accept: application/vnd.github.v3+json" \
+              echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
-                  -d "{\"ref\":\"refs/heads/${br}\"}" \
+              README_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/readme-vars.yml)
-                  https://api.github.com/repos/linuxserver/docker-heimdall/actions/workflows/package_trigger.yml/dispatches
+              if [[ $(yq -r '.project_deprecation_status' <<< "${README_VARS}") == "true" ]]; then
-                sleep 30
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> Branch appears to be deprecated; skipping trigger." >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
+              elif [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
+              elif grep -q "^heimdall_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`heimdall_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
+              elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/${br}/lastBuild/api/json | jq -r '.building' 2>/dev/null) == "true" ]; then
+                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY
+                skipped_branches="${skipped_branches}${br} "
               else
-                echo "**** Workflow doesn't exist; skipping trigger. ****"
+                echo "> [!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|")
+                if [[ -z "${response}" ]]; then
+                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                  echo "> Jenkins build could not be triggered. Skipping branch."
+                  continue
+                fi
+                echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
+                echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
+                sleep 10
+                buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+                buildurl="${buildurl%$'\r'}"
+                echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
+                echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
+                if ! curl -ifX POST \
+                  "${buildurl}submitDescription" \
+                  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
+                  --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
+                  --data-urlencode "Submit=Submit"; then
+                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                  echo "> Unable to change the Jenkins job description."
+                fi
+                sleep 20
               fi
             else
-              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
               echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
             fi
           done
-          echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
+          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"}],
+              NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-heimdall/activity/ \n"
-            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+              echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
+            fi
+            if [[ -n "${skipped_branches}" ]]; then
+              NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n"
+            fi
+            echo "**** Notifying Discord ****"
+            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
+              "description": "**Package Check Build(s) for heimdall** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}],
+              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
+          fi

.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

Dockerfile

@@ -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,29 +9,30 @@ 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 && \
   if [ -z ${HEIMDALL_RELEASE+x} ]; then \
-    HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
+    HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/2.x" \
-    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+    | awk '/sha/{print $4;exit}' FS='[""]'); \
   fi && \
   curl -o \
     /tmp/heimdall.tar.gz -L \
@@ -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/*

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,29 +9,30 @@ 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 && \
   if [ -z ${HEIMDALL_RELEASE+x} ]; then \
-    HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
+    HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/2.x" \
-    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+    | awk '/sha/{print $4;exit}' FS='[""]'); \
   fi && \
   curl -o \
     /tmp/heimdall.tar.gz -L \
@@ -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/*

README.md

@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT THIS FILE MANUALLY -->
-<!-- Please read https://github.com/linuxserver/docker-heimdall/blob/master/.github/CONTRIBUTING.md -->
+<!-- Please read https://github.com/linuxserver/docker-heimdall/blob/development/.github/CONTRIBUTING.md -->
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 
 [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
@@ -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)
@@ -36,8 +36,8 @@ Find us at:
 [![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/heimdall)
 [![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%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/)
+[![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.
 
@@ -51,7 +51,7 @@ Why not use it as your browser start page? It even has the ability to include a
 
 We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
-Simply pulling `lscr.io/linuxserver/heimdall:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/heimdall:development` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
 The architectures supported by this image are:
 
@@ -74,7 +74,6 @@ This image provides various versions that are available via tags. Please read th
 
 Access the web gui at http://SERVERIP:PORT
 
-
 ### Adding password protection
 
 This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd <username>`. Replace <username> with a username of your choice and you will be asked to enter a password. Uncomment the `basic auth` lines in `/config/nginx/site-confs/default.conf` and restart the container.
@@ -83,13 +82,16 @@ This image now supports password protection through htpasswd. Run the following
 
 To help you get started creating a container from this image you can either use docker-compose or the docker cli.
 
+>[!NOTE]
+>Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided.
+
 ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
 
 ```yaml
 ---
 services:
   heimdall:
-    image: lscr.io/linuxserver/heimdall:latest
+    image: lscr.io/linuxserver/heimdall:development
     container_name: heimdall
     environment:
       - PUID=1000
@@ -115,7 +117,7 @@ docker run -d \
   -p 443:443 \
   -v /path/to/heimdall/config:/config \
   --restart unless-stopped \
-  lscr.io/linuxserver/heimdall:latest
+  lscr.io/linuxserver/heimdall:development
 ```
 
 ## Parameters
@@ -124,8 +126,8 @@ Containers are configured using parameters passed at runtime (such as those abov
 
 | Parameter | Function |
 | :----: | --- |
-| `-p 80` | http gui |
+| `-p 80:80` | http gui |
-| `-p 443` | https gui |
+| `-p 443:443` | https gui |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
@@ -195,7 +197,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * Image version number:
 
     ```bash
-    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/heimdall:latest
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/heimdall:development
     ```
 
 ## Updating Info
@@ -243,7 +245,7 @@ Below are the instructions for updating containers:
 * Update the image:
 
     ```bash
-    docker pull lscr.io/linuxserver/heimdall:latest
+    docker pull lscr.io/linuxserver/heimdall:development
     ```
 
 * Stop the running container:
@@ -267,7 +269,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
 
@@ -279,41 +282,38 @@ cd docker-heimdall
 docker build \
   --no-cache \
   --pull \
-  -t lscr.io/linuxserver/heimdall:latest .
+  -t lscr.io/linuxserver/heimdall:development .
 ```
 
-The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
+The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
 
 ```bash
-docker run --rm --privileged multiarch/qemu-user-static:register --reset
+docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
 ```
 
 Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
 
 ## Versions
 
+* **27.06.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings.
+* **07.03.24:** - Enable the opcache and disable file revalidation.
+* **06.03.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf.
 * **23.12.23:** - Rebase to Alpine 3.19 with php 8.3.
 * **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
 * **13.04.23:** - Move ssl.conf include to default.conf.
 * **20.01.23:** - Rebase to alpine 3.17 with php8.1.
 * **14.11.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
-* **04.11.22:** - Build commits to upstream branch 2.x for the `development` tag.
+* **04.11.22:** - Build commits to upstream branch 2.x.
 * **13.03.21:** - Make searchproviders.yaml user configurable.
+* **11.03.21:** - Rebase to alpine 3.14.
 * **10.02.21:** - Revert to alpine 3.12 as php 7.4 broke laravel.
 * **10.02.21:** - Rebasing to alpine 3.13.
-* **17.08.20:** - Add php7-curl.
 * **01.06.20:** - Rebasing to alpine 3.12.
-* **17.01.20:** - Use nginx from baseimage.
 * **19.12.19:** - Rebasing to alpine 3.11.
-* **16.07.19:** - Save laravel.log to /config/log/heimdall.
+* **15.07.19:** - Save laravel.log to /config, install heimdall during first start.
 * **28.06.19:** - Rebasing to alpine 3.10.
-* **01.04.19:** - Fix permission detect logic.
-* **26.03.19:** - Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
-* **15.03.19:** - Clarify docker image tags in readme.
 * **22.02.19:** - Rebasing to alpine 3.9.
-* **16.01.18:** - Generate random app key in .env for new installs.
-* **20.11.18:** - Upgrade baseimage packages during build.
 * **04.11.18:** - Add php7-zip.
 * **31.10.18:** - Add queue service.
 * **17.10.18:** - Symlink avatars folder.

jenkins-vars.yml

@@ -2,11 +2,10 @@
 
 # jenkins variables
 project_name: docker-heimdall
-external_type: github_stable
+external_type: github_commit
-release_type: stable
+release_type: prerelease
-release_tag: latest
+release_tag: development
-ls_branch: master
+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=''

package_versions.txt

@@ -1,248 +1,252 @@
-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.5-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-r1              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                     20241121-r1            apk             
-ca-certificates-bundle              20230506-r0            apk           
+ca-certificates-bundle              20241121-r1            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.4                  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-r2                 apk             
-coreutils-fmt                       9.4-r2                 apk           
+coreutils-env                       9.5-r2                 apk             
-coreutils-sha512sum                 9.4-r2                 apk           
+coreutils-fmt                       9.5-r2                 apk             
-curl                                8.5.0-r0               apk           
+coreutils-sha512sum                 9.5-r2                 apk             
-dflydev/dot-access-data             v3.0.2                 php-composer  
+curl                                8.11.1-r0              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.3-r0              apk             
-graham-campbell/manager             v5.1.0                 php-composer  
+git-init-template                   2.45.3-r0              apk             
-graham-campbell/result-type         v1.1.2                 php-composer  
+gmp                                 6.3.0-r1               apk             
-guzzlehttp/guzzle                   7.8.1                  php-composer  
+graham-campbell/bounded-cache       v2.2.0                 php-composer    
-guzzlehttp/promises                 2.0.2                  php-composer  
+graham-campbell/github              v12.4.0                php-composer    
-guzzlehttp/psr7                     2.6.2                  php-composer  
+graham-campbell/manager             v5.1.0                 php-composer    
-guzzlehttp/uri-template             v1.0.3                 php-composer  
+graham-campbell/result-type         v1.1.2                 php-composer    
-hamcrest/hamcrest-php               v2.0.1                 php-composer  
+guzzlehttp/guzzle                   7.8.1                  php-composer    
-hiredis                             1.2.0-r0               apk           
+guzzlehttp/promises                 2.0.2                  php-composer    
-icu-data-en                         74.1-r0                apk           
+guzzlehttp/psr7                     2.6.2                  php-composer    
-icu-libs                            74.1-r0                apk           
+guzzlehttp/uri-template             v1.0.3                 php-composer    
-jq                                  1.7.1-r0               apk           
+hamcrest/hamcrest-php               v2.0.1                 php-composer    
-knplabs/github-api                  v3.13.0                php-composer  
+icu-data-en                         74.2-r0                apk             
-laravel/framework                   v10.44.0               php-composer  
+icu-libs                            74.2-r0                apk             
-laravel/prompts                     v0.1.15                php-composer  
+jq                                  1.7.1-r0               apk             
-laravel/serializable-closure        v1.3.3                 php-composer  
+knplabs/github-api                  v3.13.0                php-composer    
-laravel/tinker                      v2.9.0                 php-composer  
+laravel/framework                   v10.44.0               php-composer    
-laravel/ui                          v4.4.0                 php-composer  
+laravel/prompts                     v0.1.15                php-composer    
-laravelcollective/html              v6.4.1                 php-composer  
+laravel/serializable-closure        v1.3.3                 php-composer    
-lcobucci/jwt                        5.2.0                  php-composer  
+laravel/tinker                      v2.9.0                 php-composer    
-league/commonmark                   2.4.2                  php-composer  
+laravel/ui                          v4.4.0                 php-composer    
-league/config                       v1.2.0                 php-composer  
+laravelcollective/html              v6.4.1                 php-composer    
-league/flysystem                    3.24.0                 php-composer  
+lcobucci/jwt                        5.2.0                  php-composer    
-league/flysystem-aws-s3-v3          3.24.0                 php-composer  
+league/commonmark                   2.4.2                  php-composer    
-league/flysystem-local              3.23.1                 php-composer  
+league/config                       v1.2.0                 php-composer    
-league/mime-type-detection          1.15.0                 php-composer  
+league/flysystem                    3.24.0                 php-composer    
-libacl                              2.3.1-r4               apk           
+league/flysystem-aws-s3-v3          3.24.0                 php-composer    
-libattr                             2.5.1-r5               apk           
+league/flysystem-local              3.23.1                 php-composer    
-libbsd                              0.11.7-r3              apk           
+league/mime-type-detection          1.15.0                 php-composer    
-libbz2                              1.0.8-r6               apk           
+libacl                              2.3.2-r0               apk             
-libc-utils                          0.7.2-r5               apk           
+libattr                             2.5.2-r0               apk             
-libcrypto3                          3.1.4-r5               apk           
+libbsd                              0.12.2-r0              apk             
-libcurl                             8.5.0-r0               apk           
+libbz2                              1.0.8-r6               apk             
-libedit                             20230828.3.1-r3        apk           
+libcrypto3                          3.3.2-r1               apk             
-libexpat                            2.6.0-r0               apk           
+libcurl                             8.11.1-r0              apk             
-libgcc                              13.2.1_git20231014-r0  apk           
+libedit                             20240517.3.1-r0        apk             
-libidn2                             2.3.4-r4               apk           
+libexpat                            2.6.4-r0               apk             
-libintl                             0.22.3-r0              apk           
+libgcc                              13.2.1_git20240309-r0  apk             
-libmd                               1.1.0-r0               apk           
+libidn2                             2.3.7-r0               apk             
-libncursesw                         6.4_p20231125-r0       apk           
+libintl                             0.22.5-r0              apk             
-libpq                               16.2-r0                apk           
+libmd                               1.1.0-r0               apk             
-libproc2                            4.0.4-r0               apk           
+libncursesw                         6.4_p20240420-r2       apk             
-libssl3                             3.1.4-r5               apk           
+libpq                               16.6-r0                apk             
-libstdc++                           13.2.1_git20231014-r0  apk           
+libproc2                            4.0.4-r0               apk             
-libunistring                        1.1-r2                 apk           
+libpsl                              0.21.5-r1              apk             
-libuuid                             2.39.3-r0              apk           
+libssl3                             3.3.2-r1               apk             
-libxml2                             2.11.7-r0              apk           
+libstdc++                           13.2.1_git20240309-r0  apk             
-libzip                              1.10.1-r0              apk           
+libunistring                        1.2-r0                 apk             
-linux-pam                           1.5.3-r7               apk           
+libuuid                             2.40.1-r1              apk             
-logrotate                           3.21.0-r1              apk           
+libxml2                             2.12.7-r0              apk             
-mockery/mockery                     1.6.7                  php-composer  
+libzip                              1.10.1-r0              apk             
-monolog/monolog                     3.5.0                  php-composer  
+linux-pam                           1.6.0-r0               apk             
-mtdowling/jmespath.php              2.7.0                  php-composer  
+logrotate                           3.21.0-r1              apk             
-musl                                1.2.4_git20230717-r4   apk           
+mockery/mockery                     1.6.7                  php-composer    
-musl-utils                          1.2.4_git20230717-r4   apk           
+monolog/monolog                     3.5.0                  php-composer    
-myclabs/deep-copy                   1.11.1                 php-composer  
+mtdowling/jmespath.php              2.7.0                  php-composer    
-nano                                7.2-r1                 apk           
+musl                                1.2.5-r0               apk             
-ncurses-terminfo-base               6.4_p20231125-r0       apk           
+musl-utils                          1.2.5-r0               apk             
-nesbot/carbon                       2.72.3                 php-composer  
+myclabs/deep-copy                   1.11.1                 php-composer    
-netcat-openbsd                      1.226-r0               apk           
+nano                                8.0-r0                 apk             
-nette/schema                        v1.3.0                 php-composer  
+ncurses-terminfo-base               6.4_p20240420-r2       apk             
-nette/utils                         v4.0.4                 php-composer  
+nesbot/carbon                       2.72.3                 php-composer    
-nghttp2-libs                        1.58.0-r0              apk           
+netcat-openbsd                      1.226-r0               apk             
-nginx                               1.24.0-r15             apk           
+nette/schema                        v1.3.0                 php-composer    
-nikic/php-parser                    v5.0.0                 php-composer  
+nette/utils                         v4.0.4                 php-composer    
-nunomaduro/collision                v6.4.0                 php-composer  
+nghttp2-libs                        1.62.1-r0              apk             
-nunomaduro/termwind                 v1.15.1                php-composer  
+nginx                               1.26.2-r0              apk             
-oniguruma                           6.9.9-r0               apk           
+nikic/php-parser                    v5.0.0                 php-composer    
-openssl                             3.1.4-r5               apk           
+nunomaduro/collision                v6.4.0                 php-composer    
-pcre                                8.45-r3                apk           
+nunomaduro/termwind                 v1.15.1                php-composer    
-pcre2                               10.42-r2               apk           
+oniguruma                           6.9.9-r0               apk             
-phar-io/manifest                    2.0.3                  php-composer  
+openssl                             3.3.2-r1               apk             
-phar-io/version                     3.2.1                  php-composer  
+pcre                                8.45-r3                apk             
-php-http/cache-plugin               1.8.1                  php-composer  
+pcre2                               10.43-r0               apk             
-php-http/client-common              2.7.1                  php-composer  
+phar-io/manifest                    2.0.3                  php-composer    
-php-http/discovery                  1.19.2                 php-composer  
+phar-io/version                     3.2.1                  php-composer    
-php-http/httplug                    2.4.0                  php-composer  
+php-http/cache-plugin               1.8.1                  php-composer    
-php-http/message                    1.16.0                 php-composer  
+php-http/client-common              2.7.1                  php-composer    
-php-http/message-factory            1.1.0                  php-composer  
+php-http/discovery                  1.19.2                 php-composer    
-php-http/multipart-stream-builder   1.3.0                  php-composer  
+php-http/httplug                    2.4.0                  php-composer    
-php-http/promise                    1.3.0                  php-composer  
+php-http/message                    1.16.0                 php-composer    
-php83                               8.3.3-r0               apk           
+php-http/message-factory            1.1.0                  php-composer    
-php83-common                        8.3.3-r0               apk           
+php-http/multipart-stream-builder   1.3.0                  php-composer    
-php83-ctype                         8.3.3-r0               apk           
+php-http/promise                    1.3.0                  php-composer    
-php83-curl                          8.3.3-r0               apk           
+php83                               8.3.15-r0              apk             
-php83-dom                           8.3.3-r0               apk           
+php83-common                        8.3.15-r0              apk             
-php83-fileinfo                      8.3.3-r0               apk           
+php83-ctype                         8.3.15-r0              apk             
-php83-fpm                           8.3.3-r0               apk           
+php83-curl                          8.3.15-r0              apk             
-php83-iconv                         8.3.3-r0               apk           
+php83-dom                           8.3.15-r0              apk             
-php83-intl                          8.3.3-r0               apk           
+php83-fileinfo                      8.3.15-r0              apk             
-php83-mbstring                      8.3.3-r0               apk           
+php83-fpm                           8.3.15-r0              apk             
-php83-mysqlnd                       8.3.3-r0               apk           
+php83-iconv                         8.3.15-r0              apk             
-php83-openssl                       8.3.3-r0               apk           
+php83-intl                          8.3.15-r0              apk             
-php83-pdo                           8.3.3-r0               apk           
+php83-mbstring                      8.3.15-r0              apk             
-php83-pdo_mysql                     8.3.3-r0               apk           
+php83-mysqlnd                       8.3.15-r0              apk             
-php83-pdo_pgsql                     8.3.3-r0               apk           
+php83-opcache                       8.3.15-r0              apk             
-php83-pdo_sqlite                    8.3.3-r0               apk           
+php83-openssl                       8.3.15-r0              apk             
-php83-phar                          8.3.3-r0               apk           
+php83-pdo                           8.3.15-r0              apk             
-php83-session                       8.3.3-r0               apk           
+php83-pdo_mysql                     8.3.15-r0              apk             
-php83-simplexml                     8.3.3-r0               apk           
+php83-pdo_pgsql                     8.3.15-r0              apk             
-php83-tokenizer                     8.3.3-r0               apk           
+php83-pdo_sqlite                    8.3.15-r0              apk             
-php83-xml                           8.3.3-r0               apk           
+php83-phar                          8.3.15-r0              apk             
-php83-xmlwriter                     8.3.3-r0               apk           
+php83-session                       8.3.15-r0              apk             
-php83-zip                           8.3.3-r0               apk           
+php83-simplexml                     8.3.15-r0              apk             
-phpdocumentor/reflection-common     2.2.0                  php-composer  
+php83-tokenizer                     8.3.15-r0              apk             
-phpdocumentor/type-resolver         1.8.0                  php-composer  
+php83-xml                           8.3.15-r0              apk             
-phpoption/phpoption                 1.9.2                  php-composer  
+php83-xmlwriter                     8.3.15-r0              apk             
-phpstan/phpdoc-parser               1.25.0                 php-composer  
+php83-zip                           8.3.15-r0              apk             
-phpunit/php-code-coverage           9.2.30                 php-composer  
+phpdocumentor/reflection-common     2.2.0                  php-composer    
-phpunit/php-file-iterator           3.0.6                  php-composer  
+phpdocumentor/type-resolver         1.8.0                  php-composer    
-phpunit/php-invoker                 3.1.1                  php-composer  
+phpoption/phpoption                 1.9.2                  php-composer    
-phpunit/php-text-template           2.0.4                  php-composer  
+phpstan/phpdoc-parser               1.25.0                 php-composer    
-phpunit/php-timer                   5.0.3                  php-composer  
+phpunit/php-code-coverage           9.2.30                 php-composer    
-phpunit/phpunit                     9.6.16                 php-composer  
+phpunit/php-file-iterator           3.0.6                  php-composer    
-popt                                1.19-r3                apk           
+phpunit/php-invoker                 3.1.1                  php-composer    
-procps-ng                           4.0.4-r0               apk           
+phpunit/php-text-template           2.0.4                  php-composer    
-psr/cache                           3.0.0                  php-composer  
+phpunit/php-timer                   5.0.3                  php-composer    
-psr/clock                           1.0.0                  php-composer  
+phpunit/phpunit                     9.6.16                 php-composer    
-psr/container                       2.0.2                  php-composer  
+popt                                1.19-r3                apk             
-psr/event-dispatcher                1.0.0                  php-composer  
+procps-ng                           4.0.4-r0               apk             
-psr/http-client                     1.0.3                  php-composer  
+psr/cache                           3.0.0                  php-composer    
-psr/http-factory                    1.0.2                  php-composer  
+psr/clock                           1.0.0                  php-composer    
-psr/http-message                    2.0                    php-composer  
+psr/container                       2.0.2                  php-composer    
-psr/log                             3.0.0                  php-composer  
+psr/event-dispatcher                1.0.0                  php-composer    
-psr/simple-cache                    3.0.0                  php-composer  
+psr/http-client                     1.0.3                  php-composer    
-psy/psysh                           v0.12.0                php-composer  
+psr/http-factory                    1.0.2                  php-composer    
-ralouphie/getallheaders             3.0.3                  php-composer  
+psr/http-message                    2.0                    php-composer    
-ramsey/collection                   2.0.0                  php-composer  
+psr/log                             3.0.0                  php-composer    
-ramsey/uuid                         4.7.5                  php-composer  
+psr/simple-cache                    3.0.0                  php-composer    
-readline                            8.2.1-r2               apk           
+psy/psysh                           v0.12.0                php-composer    
-scanelf                             1.3.7-r2               apk           
+ralouphie/getallheaders             3.0.3                  php-composer    
-sebastian/cli-parser                1.0.1                  php-composer  
+ramsey/collection                   2.0.0                  php-composer    
-sebastian/code-unit                 1.0.8                  php-composer  
+ramsey/uuid                         4.7.5                  php-composer    
-sebastian/code-unit-reverse-lookup  2.0.3                  php-composer  
+readline                            8.2.10-r0              apk             
-sebastian/comparator                4.0.8                  php-composer  
+scanelf                             1.3.7-r2               apk             
-sebastian/complexity                2.0.3                  php-composer  
+sebastian/cli-parser                1.0.1                  php-composer    
-sebastian/diff                      4.0.5                  php-composer  
+sebastian/code-unit                 1.0.8                  php-composer    
-sebastian/environment               5.1.5                  php-composer  
+sebastian/code-unit-reverse-lookup  2.0.3                  php-composer    
-sebastian/exporter                  4.0.5                  php-composer  
+sebastian/comparator                4.0.8                  php-composer    
-sebastian/global-state              5.0.6                  php-composer  
+sebastian/complexity                2.0.3                  php-composer    
-sebastian/lines-of-code             1.0.4                  php-composer  
+sebastian/diff                      4.0.5                  php-composer    
-sebastian/object-enumerator         4.0.4                  php-composer  
+sebastian/environment               5.1.5                  php-composer    
-sebastian/object-reflector          2.0.4                  php-composer  
+sebastian/exporter                  4.0.5                  php-composer    
-sebastian/recursion-context         4.0.5                  php-composer  
+sebastian/global-state              5.0.6                  php-composer    
-sebastian/resource-operations       3.0.3                  php-composer  
+sebastian/lines-of-code             1.0.4                  php-composer    
-sebastian/type                      3.2.1                  php-composer  
+sebastian/object-enumerator         4.0.4                  php-composer    
-sebastian/version                   3.0.2                  php-composer  
+sebastian/object-reflector          2.0.4                  php-composer    
-shadow                              4.14.2-r0              apk           
+sebastian/recursion-context         4.0.5                  php-composer    
-skalibs                             2.14.0.1-r0            apk           
+sebastian/resource-operations       3.0.3                  php-composer    
-spatie/backtrace                    1.5.3                  php-composer  
+sebastian/type                      3.2.1                  php-composer    
-spatie/flare-client-php             1.4.4                  php-composer  
+sebastian/version                   3.0.2                  php-composer    
-spatie/ignition                     1.12.0                 php-composer  
+shadow                              4.15.1-r0              apk             
-spatie/laravel-ignition             2.4.2                  php-composer  
+skalibs                             2.14.1.1-r0            apk             
-sqlite-libs                         3.44.2-r0              apk           
+spatie/backtrace                    1.5.3                  php-composer    
-squizlabs/php_codesniffer           3.9.0                  php-composer  
+spatie/flare-client-php             1.4.4                  php-composer    
-ssl_client                          1.36.1-r15             apk           
+spatie/ignition                     1.12.0                 php-composer    
-symfony/cache                       v6.4.3                 php-composer  
+spatie/laravel-ignition             2.4.2                  php-composer    
-symfony/cache-contracts             v3.4.0                 php-composer  
+sqlite-libs                         3.45.3-r1              apk             
-symfony/console                     v6.4.3                 php-composer  
+squizlabs/php_codesniffer           3.9.0                  php-composer    
-symfony/css-selector                v7.0.3                 php-composer  
+ssl_client                          1.36.1-r29             apk             
-symfony/deprecation-contracts       v3.4.0                 php-composer  
+symfony/cache                       v6.4.3                 php-composer    
-symfony/error-handler               v6.4.3                 php-composer  
+symfony/cache-contracts             v3.4.0                 php-composer    
-symfony/event-dispatcher            v7.0.3                 php-composer  
+symfony/console                     v6.4.3                 php-composer    
-symfony/event-dispatcher-contracts  v3.4.0                 php-composer  
+symfony/css-selector                v7.0.3                 php-composer    
-symfony/finder                      v6.4.0                 php-composer  
+symfony/deprecation-contracts       v3.4.0                 php-composer    
-symfony/http-foundation             v6.4.3                 php-composer  
+symfony/error-handler               v6.4.3                 php-composer    
-symfony/http-kernel                 v6.4.3                 php-composer  
+symfony/event-dispatcher            v7.0.3                 php-composer    
-symfony/mailer                      v6.4.3                 php-composer  
+symfony/event-dispatcher-contracts  v3.4.0                 php-composer    
-symfony/mime                        v6.4.3                 php-composer  
+symfony/finder                      v6.4.0                 php-composer    
-symfony/options-resolver            v7.0.0                 php-composer  
+symfony/http-foundation             v6.4.3                 php-composer    
-symfony/polyfill-ctype              v1.29.0                php-composer  
+symfony/http-kernel                 v6.4.3                 php-composer    
-symfony/polyfill-intl-grapheme      v1.29.0                php-composer  
+symfony/mailer                      v6.4.3                 php-composer    
-symfony/polyfill-intl-idn           v1.29.0                php-composer  
+symfony/mime                        v6.4.3                 php-composer    
-symfony/polyfill-intl-normalizer    v1.29.0                php-composer  
+symfony/options-resolver            v7.0.0                 php-composer    
-symfony/polyfill-mbstring           v1.29.0                php-composer  
+symfony/polyfill-ctype              v1.29.0                php-composer    
-symfony/polyfill-php72              v1.29.0                php-composer  
+symfony/polyfill-intl-grapheme      v1.29.0                php-composer    
-symfony/polyfill-php80              v1.29.0                php-composer  
+symfony/polyfill-intl-idn           v1.29.0                php-composer    
-symfony/polyfill-php83              v1.29.0                php-composer  
+symfony/polyfill-intl-normalizer    v1.29.0                php-composer    
-symfony/polyfill-uuid               v1.29.0                php-composer  
+symfony/polyfill-mbstring           v1.29.0                php-composer    
-symfony/process                     v6.4.3                 php-composer  
+symfony/polyfill-php72              v1.29.0                php-composer    
-symfony/routing                     v6.4.3                 php-composer  
+symfony/polyfill-php80              v1.29.0                php-composer    
-symfony/service-contracts           v3.4.1                 php-composer  
+symfony/polyfill-php83              v1.29.0                php-composer    
-symfony/string                      v7.0.3                 php-composer  
+symfony/polyfill-uuid               v1.29.0                php-composer    
-symfony/thanks                      v1.2.10                php-composer  
+symfony/process                     v6.4.3                 php-composer    
-symfony/translation                 v6.4.3                 php-composer  
+symfony/routing                     v6.4.3                 php-composer    
-symfony/translation-contracts       v3.4.1                 php-composer  
+symfony/service-contracts           v3.4.1                 php-composer    
-symfony/uid                         v6.4.3                 php-composer  
+symfony/string                      v7.0.3                 php-composer    
-symfony/var-dumper                  v6.4.3                 php-composer  
+symfony/thanks                      v1.2.10                php-composer    
-symfony/var-exporter                v7.0.3                 php-composer  
+symfony/translation                 v6.4.3                 php-composer    
-symfony/yaml                        v6.4.3                 php-composer  
+symfony/translation-contracts       v3.4.1                 php-composer    
-theseer/tokenizer                   1.2.2                  php-composer  
+symfony/uid                         v6.4.3                 php-composer    
-tijsverkoyen/css-to-inline-styles   v2.2.7                 php-composer  
+symfony/var-dumper                  v6.4.3                 php-composer    
-tzdata                              2024a-r0               apk           
+symfony/var-exporter                v7.0.3                 php-composer    
-utmps-libs                          0.1.2.2-r0             apk           
+symfony/yaml                        v6.4.3                 php-composer    
-vlucas/phpdotenv                    v5.6.0                 php-composer  
+theseer/tokenizer                   1.2.2                  php-composer    
-voku/portable-ascii                 2.0.1                  php-composer  
+tijsverkoyen/css-to-inline-styles   v2.2.7                 php-composer    
-webmozart/assert                    1.11.0                 php-composer  
+tzdata                              2024b-r0               apk             
-xz-libs                             5.4.5-r0               apk           
+utmps-libs                          0.1.2.2-r1             apk             
-zlib                                1.3.1-r0               apk           
+vlucas/phpdotenv                    v5.6.0                 php-composer    
-zstd-libs                           1.5.5-r8               apk           
+voku/portable-ascii                 2.0.1                  php-composer    
+webmozart/assert                    1.11.0                 php-composer    
+xz-libs                             5.6.2-r0               apk             
+zlib                                1.3.1-r1               apk             
+zstd-libs                           1.5.6-r0               apk             

readme-vars.yml

@@ -11,72 +11,117 @@ project_blurb: |
 
   Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
-
 # supported architectures
 available_architectures:
-  - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
+  - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
-  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
+  - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-
 # development version
 development_versions: true
 development_versions_items:
-  - { tag: "latest", desc: "Stable Heimdall releases." }
+  - {tag: "latest", desc: "Stable Heimdall releases."}
-  - { tag: "development", desc: "Latest commit from the github 2.x branch." }
+  - {tag: "development", desc: "Latest commit from the github 2.x branch."}
-
 # container parameters
 common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
+  - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files"}
 param_usage_include_ports: true
 param_ports:
-  - { external_port: "80", internal_port: "80", port_desc: "http gui" }
+  - {external_port: "80", internal_port: "80", port_desc: "http gui"}
-  - { external_port: "443", internal_port: "443", port_desc: "https 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"}
-
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
   Access the web gui at http://SERVERIP:PORT
 
-
   ### Adding password protection
-  
-  This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd <username>`. Replace <username> with a username of your choice and you will be asked to enter a password. Uncomment the `basic auth` lines in `/config/nginx/site-confs/default.conf` and restart the container.
 
+  This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd <username>`. Replace <username> with a username of your choice and you will be asked to enter a password. Uncomment the `basic auth` lines in `/config/nginx/site-confs/default.conf` and restart the container.
+# init diagram
+init_diagram: |
+  "heimdall:development": {
+    docker-mods
+    base {
+      fix-attr +\nlegacy cont-init
+    }
+    docker-mods -> base
+    legacy-services
+    custom services
+    init-services -> legacy-services
+    init-services -> custom services
+    custom services -> legacy-services
+    legacy-services -> ci-service-check
+    init-migrations -> init-adduser
+    init-nginx-end -> init-config
+    init-os-end -> init-config
+    init-config -> init-config-end
+    init-heimdall-config -> init-config-end
+    init-os-end -> init-crontab-config
+    init-mods-end -> init-custom-files
+    base -> init-envfile
+    init-os-end -> init-folders
+    init-nginx-end -> init-heimdall-config
+    init-php -> init-keygen
+    base -> init-migrations
+    base -> init-mods
+    init-config-end -> init-mods
+    init-version-checks -> init-mods
+    init-mods -> init-mods-end
+    init-mods-package-install -> init-mods-end
+    init-mods -> init-mods-package-install
+    init-samples -> init-nginx
+    init-permissions -> init-nginx-end
+    base -> init-os-end
+    init-adduser -> init-os-end
+    init-envfile -> init-os-end
+    init-migrations -> init-os-end
+    init-keygen -> init-permissions
+    init-nginx -> init-php
+    init-folders -> init-samples
+    init-custom-files -> init-services
+    init-mods-end -> init-services
+    init-config-end -> init-version-checks
+    init-services -> svc-cron
+    svc-cron -> legacy-services
+    init-services -> svc-nginx
+    svc-nginx -> legacy-services
+    init-services -> svc-php-fpm
+    svc-php-fpm -> legacy-services
+    init-services -> svc-queue
+    svc-queue -> legacy-services
+  }
+  Base Images: {
+    "baseimage-alpine-nginx:3.20" <- "baseimage-alpine:3.20"
+  }
+  "heimdall:development" <- Base Images
 # changelog
 changelogs:
-  - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}
+  - {date: "27.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
-  - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
+  - {date: "07.03.24:", desc: "Enable the opcache and disable file revalidation."}
-  - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
+  - {date: "06.03.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf."}
-  - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
+  - {date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}
-  - { date: "14.11.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
+  - {date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf."}
-  - { date: "04.11.22:", desc: "Build commits to upstream branch 2.x for the `development` tag." }
+  - {date: "13.04.23:", desc: "Move ssl.conf include to default.conf."}
-  - { date: "13.03.21:", desc: "Make searchproviders.yaml user configurable." }
+  - {date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1."}
-  - { date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel." }
+  - {date: "14.11.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))."}
-  - { date: "10.02.21:", desc: "Rebasing to alpine 3.13." }
+  - {date: "04.11.22:", desc: "Build commits to upstream branch 2.x."}
-  - { date: "17.08.20:", desc: "Add php7-curl." }
+  - {date: "13.03.21:", desc: "Make searchproviders.yaml user configurable."}
-  - { date: "01.06.20:", desc: "Rebasing to alpine 3.12." }
+  - {date: "11.03.21:", desc: "Rebase to alpine 3.14."}
-  - { date: "17.01.20:", desc: "Use nginx from baseimage." }
+  - {date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel."}
-  - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
+  - {date: "10.02.21:", desc: "Rebasing to alpine 3.13."}
-  - { date: "16.07.19:", desc: "Save laravel.log to /config/log/heimdall." }
+  - {date: "01.06.20:", desc: "Rebasing to alpine 3.12."}
-  - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
+  - {date: "19.12.19:", desc: "Rebasing to alpine 3.11."}
-  - { date: "01.04.19:", desc: "Fix permission detect logic." }
+  - {date: "15.07.19:", desc: "Save laravel.log to /config, install heimdall during first start."}
-  - { date: "26.03.19:", desc: "Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown." }
+  - {date: "28.06.19:", desc: "Rebasing to alpine 3.10."}
-  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
+  - {date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag."}
-  - { date: "15.03.19:", desc: "Clarify docker image tags in readme." }
+  - {date: "22.02.19:", desc: "Rebasing to alpine 3.9."}
-  - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }
+  - {date: "04.11.18:", desc: "Add php7-zip."}
-  - { date: "16.01.18:", desc: "Generate random app key in .env for new installs." }
+  - {date: "31.10.18:", desc: "Add queue service."}
-  - { date: "20.11.18:", desc: "Upgrade baseimage packages during build." }
+  - {date: "17.10.18:", desc: "Symlink avatars folder."}
-  - { date: "04.11.18:", desc: "Add php7-zip." }
+  - {date: "16.10.18:", desc: "Updated fastcgi_params for user login support."}
-  - { date: "31.10.18:", desc: "Add queue service." }
+  - {date: "07.10.18:", desc: "Symlink `.env` rather than copy. It now resides under `/config/www`"}
-  - { date: "17.10.18:", desc: "Symlink avatars folder." }
+  - {date: "30.09.18:", desc: "Multi-arch image. Move `.env` to `/config`."}
-  - { date: "16.10.18:", desc: "Updated fastcgi_params for user login support." }
+  - {date: "05.09.18:", desc: "Rebase to alpine linux 3.8."}
-  - { date: "07.10.18:", desc: "Symlink `.env` rather than copy. It now resides under `/config/www`" }
+  - {date: "06.03.18:", desc: "Use password protection if htpasswd is set. Existing users can delete their default site config at /config/nginx/site-confs/default.conf and restart the container, a new default site config with htpasswd support will be created in its place"}
-  - { date: "30.09.18:", desc: "Multi-arch image. Move `.env` to `/config`." }
+  - {date: "12.02.18:", desc: "Initial Release."}
-  - { date: "05.09.18:", desc: "Rebase to alpine linux 3.8." }
-  - { date: "06.03.18:", desc: "Use password protection if htpasswd is set. Existing users can delete their default site config at /config/nginx/site-confs/default.conf and restart the container, a new default site config with htpasswd support will be created in its place" }
-  - { date: "12.02.18:", desc: "Initial Release." }

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;
-    }
-}