Bot Updating Package Versions

Rebase to alpine 3.17 with php8.1 (master)

.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/development/readme-vars.yml).
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-heimdall/edit/master/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 and vice versa using `lscr.io/linuxserver/qemu-static`
+The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
 
 ```bash
-docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
+docker run --rm --privileged multiarch/qemu-user-static:register --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/development/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/master/root), add an entry to the changelog
 
 ```yml
 changelogs:

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -53,6 +53,7 @@ body:
       options:
         - x86-64
         - arm64
+        - armhf
     validations:
       required: true
   - type: textarea
@@ -67,10 +68,10 @@ body:
   - type: textarea
     attributes:
       description: |
-        Provide a full docker log, output of "docker logs heimdall"
+        Provide a full docker log, output of "docker logs linuxserver.io"
       label: Container logs
       placeholder: |
-        Output of `docker logs heimdall`
+        Output of `docker logs linuxserver.io`
       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/development/.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/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
 
 ------------------------------
 

.github/workflows/call_issue_pr_tracker.yml

@@ -2,11 +2,9 @@ name: Issue & PR Tracker
 
 on:
   issues:
-    types: [opened,reopened,labeled,unlabeled,closed]
+    types: [opened,reopened,labeled,unlabeled]
   pull_request_target:
-    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
+    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled]
-  pull_request_review:
-    types: [submitted,edited,dismissed]
 
 jobs:
   manage-project:

.github/workflows/external_trigger.yml

@@ -4,31 +4,24 @@ on:
   workflow_dispatch:
 
 jobs:
-  external-trigger-development:
+  external-trigger-master:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v3.1.0
 
       - name: External Trigger
-        if: github.ref == 'refs/heads/development'
+        if: github.ref == 'refs/heads/master'
-        env:
-          SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
         run: |
-          printf "# External trigger for docker-heimdall\n\n" >> $GITHUB_STEP_SUMMARY
+          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER }}" ]; then
-          if grep -q "^heimdall_development" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_HEIMDALL_MASTER is set; skipping trigger. ****"
-            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`heimdall_development\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
-          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\". ****"
-          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 "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "**** Can't retrieve external version, exiting ****"
-            echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
+            FAILURE_REASON="Can't retrieve external version for heimdall branch master"
-            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"}],
@@ -36,42 +29,23 @@ jobs:
             exit 1
           fi
           EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
-          echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
+          echo "**** External version: ${EXT_RELEASE} ****"
-          echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
+          echo "**** Retrieving last pushed version ****"
           image="linuxserver/heimdall"
-          tag="development"
+          tag="latest"
           token=$(curl -sX GET \
             "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fheimdall%3Apull" \
             | jq -r '.token')
-          multidigest=$(curl -s \
+            multidigest=$(curl -s \
-            --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-            --header "Accept: application/vnd.oci.image.index.v1+json" \
-            --header "Authorization: Bearer ${token}" \
-            "https://ghcr.io/v2/${image}/manifests/${tag}")
-          if jq -e '.layers // empty' <<< "${multidigest}" >/dev/null 2>&1; then
-            # If there's a layer element it's a single-arch manifest so just get that digest
-            digest=$(jq -r '.config.digest' <<< "${multidigest}")
-          else
-            # Otherwise it's multi-arch or has manifest annotations
-            if jq -e '.manifests[]?.annotations // empty' <<< "${multidigest}" >/dev/null 2>&1; then
-              # Check for manifest annotations and delete if found
-              multidigest=$(jq 'del(.manifests[] | select(.annotations))' <<< "${multidigest}")
-            fi
-            if [[ $(jq '.manifests | length' <<< "${multidigest}") -gt 1 ]]; then
-              # If there's still more than one digest, it's multi-arch
-              multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}")
-            else
-              # Otherwise it's single arch
-              multidigest=$(jq -r ".manifests[].digest?" <<< "${multidigest}")
-            fi
-            if digest=$(curl -s \
               --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-              --header "Accept: application/vnd.oci.image.manifest.v1+json" \
               --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${multidigest}"); then
+              "https://ghcr.io/v2/${image}/manifests/${tag}" \
-              digest=$(jq -r '.config.digest' <<< "${digest}");
+              | jq -r 'first(.manifests[].digest)')
-            fi
+            digest=$(curl -s \
-          fi
+              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+              --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}")
@@ -83,54 +57,40 @@ 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 "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "**** Can't retrieve last pushed version, exiting ****"
-            echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
+            FAILURE_REASON="Can't retrieve last pushed version for heimdall tag latest"
-            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}\`" >> $GITHUB_STEP_SUMMARY
+          echo "**** Last pushed version: ${IMAGE_VERSION} ****"
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
-            echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
+            echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
             exit 0
-          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
-            echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
+            echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
             exit 0
           else
-            if [[ "${artifacts_found}" == "false" ]]; then
+            echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
-              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 "**** Attempting to change the Jenkins job description ****"
-                echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
+            curl -iX POST \
-              fi
+              "${buildurl}submitDescription" \
-              response=$(curl -iX POST \
+              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/buildWithParameters?PACKAGE_CHECK=false \
+              --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+              --data-urlencode "Submit=Submit"
-              echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
+            echo "**** Notifying Discord ****"
-              echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
+            TRIGGER_REASON="A version change was detected for heimdall tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
-              sleep 10
+            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-              buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
+              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
-              buildurl="${buildurl%$'\r'}"
+              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-              echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
-              echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
-              curl -iX POST \
-                "${buildurl}submitDescription" \
-                --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-                --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-                --data-urlencode "Submit=Submit"
-              echo "**** Notifying Discord ****"
-              TRIGGER_REASON="A version change was detected for heimdall tag 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

@@ -2,44 +2,42 @@ name: External Trigger Scheduler
 
 on:
   schedule:
-    - cron:  '39 * * * *'
+    - cron:  '35 * * * *'
   workflow_dispatch:
 
 jobs:
   external-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: '0'
 
       - name: External Trigger Scheduler
         run: |
-          printf "# External trigger scheduler for docker-heimdall\n\n" >> $GITHUB_STEP_SUMMARY
+          echo "**** Branches found: ****"
-          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
+          git for-each-ref --format='%(refname:short)' refs/remotes
-          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
+          echo "**** Pulling the yq docker image ****"
+          docker pull ghcr.io/linuxserver/yq
+          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
           do
-            if [[ "${br}" == "HEAD" ]]; then
+            br=$(echo "$br" | sed 's|origin/||g')
-              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
+            echo "**** Evaluating branch ${br} ****"
-              continue
+            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml \
-            fi
+              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
-            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
+            if [ "$br" == "$ls_branch" ]; then
-            ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml)
+              echo "**** Branch ${br} appears to be live; checking workflow. ****"
-            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 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 "Triggering external trigger workflow for branch." >> $GITHUB_STEP_SUMMARY
+                echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
                 curl -iX POST \
                   -H "Authorization: token ${{ secrets.CR_PAT }}" \
                   -H "Accept: application/vnd.github.v3+json" \
                   -d "{\"ref\":\"refs/heads/${br}\"}" \
                   https://api.github.com/repos/linuxserver/docker-heimdall/actions/workflows/external_trigger.yml/dispatches
               else
-                echo "Skipping branch due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
+                echo "**** Workflow doesn't exist; skipping trigger. ****"
               fi
             else
-              echo "Skipping branch due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
+              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
             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/development/.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/master/.github/PULL_REQUEST_TEMPLATE.md)!'
         repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/package_trigger.yml

@@ -0,0 +1,38 @@
+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. ****"
+            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 ****"
+            exit 0
+          fi
+          echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_HEIMDALL_MASTER\". ****"
+          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 "**** 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,92 +9,42 @@ jobs:
   package-trigger-scheduler:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.1
+      - uses: actions/checkout@v3.1.0
         with:
           fetch-depth: '0'
 
       - name: Package Trigger Scheduler
-        env:
-          SKIP_PACKAGE_TRIGGER: ${{ vars.SKIP_PACKAGE_TRIGGER }}
         run: |
-          printf "# Package trigger scheduler for docker-heimdall\n\n" >> $GITHUB_STEP_SUMMARY
+          echo "**** Branches found: ****"
-          printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY
+          git for-each-ref --format='%(refname:short)' refs/remotes
-          for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes)
+          echo "**** Pulling the yq docker image ****"
+          docker pull ghcr.io/linuxserver/yq
+          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
           do
-            if [[ "${br}" == "HEAD" ]]; then
+            br=$(echo "$br" | sed 's|origin/||g')
-              printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY
+            echo "**** Evaluating branch ${br} ****"
-              continue
+            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml \
-            fi
+              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
-            printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
+            if [ "${br}" == "${ls_branch}" ]; then
-            JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml)
+              echo "**** Branch ${br} appears to be live; checking workflow. ****"
-            if ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/Jenkinsfile >/dev/null 2>&1; then
+              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
-              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
-              echo "> No Jenkinsfile found. Branch is either deprecated or is an early dev branch." >> $GITHUB_STEP_SUMMARY
-              skipped_branches="${skipped_branches}${br} "
-            elif [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
-              echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
-              README_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/readme-vars.yml)
-              if [[ $(yq -r '.project_deprecation_status' <<< "${README_VARS}") == "true" ]]; then
-                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                echo "> Branch appears to be deprecated; skipping trigger." >> $GITHUB_STEP_SUMMARY
-                skipped_branches="${skipped_branches}${br} "
-              elif [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then
-                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY
-                skipped_branches="${skipped_branches}${br} "
-              elif grep -q "^heimdall_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then
-                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`heimdall_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
-                skipped_branches="${skipped_branches}${br} "
-              elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/${br}/lastBuild/api/json | jq -r '.building' 2>/dev/null) == "true" ]; then
-                echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-                echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY
-                skipped_branches="${skipped_branches}${br} "
-              else
-                echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
-                echo "> Triggering package trigger for branch ${br}" >> $GITHUB_STEP_SUMMARY
-                printf "> To disable, add \`heimdall_%s\` into the Github organizational variable \`SKIP_PACKAGE_TRIGGER\`.\n\n" "${br}" >> $GITHUB_STEP_SUMMARY
                 triggered_branches="${triggered_branches}${br} "
-                response=$(curl -iX POST \
+                curl -iX POST \
-                  https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/${br}/buildWithParameters?PACKAGE_CHECK=true \
+                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
-                  --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+                  -H "Accept: application/vnd.github.v3+json" \
-                if [[ -z "${response}" ]]; then
+                  -d "{\"ref\":\"refs/heads/${br}\"}" \
-                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                  https://api.github.com/repos/linuxserver/docker-heimdall/actions/workflows/package_trigger.yml/dispatches
-                  echo "> Jenkins build could not be triggered. Skipping branch."
+                sleep 30
-                  continue
+              else
-                fi
+                echo "**** Workflow doesn't exist; skipping trigger. ****"
-                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 "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
+              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
             fi
           done
-          if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then
+          echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
-            if [[ -n "${triggered_branches}" ]]; then
+          echo "**** Notifying Discord ****"
-              NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n"
+          curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-              NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-heimdall/activity/ \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"}],
-              echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
+            "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-            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,8 +5,6 @@ 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.20
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -9,30 +9,31 @@ 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 \
+  apk add --no-cache --upgrade \
-    php83-dom \
+    php81-ctype \
-    php83-intl \
+    php81-curl \
-    php83-opcache \
+    php81-intl \
-    php83-pdo_mysql \
+    php81-pdo_pgsql \
-    php83-pdo_pgsql \
+    php81-pdo_sqlite \
-    php83-pdo_sqlite \
+    php81-pdo_mysql \
-    php83-tokenizer && \
+    php81-tokenizer \
+    php81-zip && \
   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/commits/2.x" \
+    HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
-    | awk '/sha/{print $4;exit}' FS='[""]'); \
+    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   fi && \
   curl -o \
     /tmp/heimdall.tar.gz -L \
@@ -42,7 +43,6 @@ 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.20
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -9,30 +9,31 @@ 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 \
+  apk add --no-cache --upgrade \
-    php83-dom \
+    php81-ctype \
-    php83-intl \
+    php81-curl \
-    php83-opcache \
+    php81-intl \
-    php83-pdo_mysql \
+    php81-pdo_pgsql \
-    php83-pdo_pgsql \
+    php81-pdo_sqlite \
-    php83-pdo_sqlite \
+    php81-pdo_mysql \
-    php83-tokenizer && \
+    php81-tokenizer \
+    php81-zip && \
   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/commits/2.x" \
+    HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
-    | awk '/sha/{print $4;exit}' FS='[""]'); \
+    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
   fi && \
   curl -o \
     /tmp/heimdall.tar.gz -L \
@@ -42,7 +43,6 @@ 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.armhf

@@ -0,0 +1,55 @@
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17
+
+# set version label
+ARG BUILD_DATE
+ARG VERSION
+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 --upgrade \
+    php81-ctype \
+    php81-curl \
+    php81-intl \
+    php81-pdo_pgsql \
+    php81-pdo_sqlite \
+    php81-pdo_mysql \
+    php81-tokenizer \
+    php81-zip && \
+  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 "**** 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" \
+    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+  fi && \
+  curl -o \
+    /tmp/heimdall.tar.gz -L \
+    "https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
+  mkdir -p \
+    /app/www-tmp && \
+  tar xf \
+    /tmp/heimdall.tar.gz -C \
+    /app/www-tmp --strip-components=1 && \
+  echo "**** cleanup ****" && \
+  rm -rf \
+    /tmp/*
+
+# add local files
+COPY root/ /
+
+# ports and volumes
+EXPOSE 80 443
+VOLUME /config

README.md

@@ -1,5 +1,6 @@
-<!-- DO NOT EDIT THIS FILE MANUALLY -->
+<!-- DO NOT EDIT THIS FILE MANUALLY  -->
-<!-- Please read https://github.com/linuxserver/docker-heimdall/blob/development/.github/CONTRIBUTING.md -->
+<!-- Please read the https://github.com/linuxserver/docker-heimdall/blob/master/.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 +29,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)
+[![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)
 [![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 +37,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%2Fdevelopment%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/)
+[![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/)
-[![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)
+[![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)
 
 [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.
 
@@ -49,9 +50,9 @@ Why not use it as your browser start page? It even has the ability to include a
 
 ## Supported Architectures
 
-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/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
-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.
+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.
 
 The architectures supported by this image are:
 
@@ -59,7 +60,7 @@ The architectures supported by this image are:
 | :----: | :----: | ---- |
 | x86-64 | ✅ | amd64-\<version tag\> |
 | arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf | ❌ | |
+| armhf | ✅ | arm32v7-\<version tag\> |
 
 ## Version Tags
 
@@ -69,36 +70,34 @@ This image provides various versions that are available via tags. Please read th
 | :----: | :----: |--- |
 | latest | ✅ | Stable Heimdall releases. |
 | development | ✅ | Latest commit from the github 2.x branch. |
-
 ## Application Setup
 
 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.
 
 ## Usage
 
-To help you get started creating a container from this image you can either use docker-compose or the docker cli.
+Here are some example snippets to help you get started creating a container.
-
->[!NOTE]
->Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided.
 
 ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
 
 ```yaml
 ---
+version: "2.1"
 services:
   heimdall:
-    image: lscr.io/linuxserver/heimdall:development
+    image: lscr.io/linuxserver/heimdall:latest
     container_name: heimdall
     environment:
       - PUID=1000
       - PGID=1000
       - TZ=Etc/UTC
     volumes:
-      - /path/to/heimdall/config:/config
+      - /path/to/appdata/config:/config
     ports:
       - 80:80
       - 443:443
@@ -115,23 +114,24 @@ docker run -d \
   -e TZ=Etc/UTC \
   -p 80:80 \
   -p 443:443 \
-  -v /path/to/heimdall/config:/config \
+  -v /path/to/appdata/config:/config \
   --restart unless-stopped \
-  lscr.io/linuxserver/heimdall:development
+  lscr.io/linuxserver/heimdall:latest
+
 ```
 
 ## Parameters
 
-Containers are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
+Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
 
 | Parameter | Function |
 | :----: | --- |
-| `-p 80:80` | http gui |
+| `-p 80` | http gui |
-| `-p 443:443` | https gui |
+| `-p 443` | https gui |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
-| `-v /config` | Persistent config files |
+| `-v /config` | Contains all relevant configuration files. |
 
 ## Environment variables from files (Docker secrets)
 
@@ -140,10 +140,10 @@ You can set any environment variable from a file by using a special prepend `FIL
 As an example:
 
 ```bash
--e FILE__MYVAR=/run/secrets/mysecretvariable
+-e FILE__PASSWORD=/run/secrets/mysecretpassword
 ```
 
-Will set the environment variable `MYVAR` based on the contents of the `/run/secrets/mysecretvariable` file.
+Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
 
 ## Umask for running applications
 
@@ -152,20 +152,15 @@ Keep in mind umask is not chmod it subtracts from permissions based on it's valu
 
 ## User / Group Identifiers
 
-When using volumes (`-v` flags), permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
+When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
 
 Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.
 
-In this instance `PUID=1000` and `PGID=1000`, to find yours use `id your_user` as below:
+In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
 
 ```bash
-id your_user
+  $ id username
-```
+    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
-
-Example output:
-
-```text
-uid=1000(your_user) gid=1000(your_user) groups=1000(your_user)
 ```
 
 ## Docker Mods
@@ -176,101 +171,53 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 
 ## Support Info
 
-* Shell access whilst the container is running:
+* Shell access whilst the container is running: `docker exec -it heimdall /bin/bash`
-
+* To monitor the logs of the container in realtime: `docker logs -f heimdall`
-    ```bash
+* container version number
-    docker exec -it heimdall /bin/bash
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' heimdall`
-    ```
+* image version number
-
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/heimdall:latest`
-* To monitor the logs of the container in realtime:
-
-    ```bash
-    docker logs -f heimdall
-    ```
-
-* Container version number:
-
-    ```bash
-    docker inspect -f '{{ index .Config.Labels "build_version" }}' heimdall
-    ```
-
-* Image version number:
-
-    ```bash
-    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/heimdall:development
-    ```
 
 ## Updating Info
 
-Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
+Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
 
 Below are the instructions for updating containers:
 
 ### Via Docker Compose
 
-* Update images:
+* Update all images: `docker-compose pull`
-    * All images:
+  * or update a single image: `docker-compose pull heimdall`
-
+* Let compose update all containers as necessary: `docker-compose up -d`
-        ```bash
+  * or update a single container: `docker-compose up -d heimdall`
-        docker-compose pull
+* You can also remove the old dangling images: `docker image prune`
-        ```
-
-    * Single image:
-
-        ```bash
-        docker-compose pull heimdall
-        ```
-
-* Update containers:
-    * All containers:
-
-        ```bash
-        docker-compose up -d
-        ```
-
-    * Single container:
-
-        ```bash
-        docker-compose up -d heimdall
-        ```
-
-* You can also remove the old dangling images:
-
-    ```bash
-    docker image prune
-    ```
 
 ### Via Docker Run
 
-* Update the image:
+* Update the image: `docker pull lscr.io/linuxserver/heimdall:latest`
-
+* Stop the running container: `docker stop heimdall`
-    ```bash
+* Delete the container: `docker rm heimdall`
-    docker pull lscr.io/linuxserver/heimdall:development
-    ```
-
-* Stop the running container:
-
-    ```bash
-    docker stop heimdall
-    ```
-
-* Delete the container:
-
-    ```bash
-    docker rm heimdall
-    ```
-
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
-* You can also remove the old dangling images:
+* You can also remove the old dangling images: `docker image prune`
 
-    ```bash
+### Via Watchtower auto-updater (only use if you don't remember the original parameters)
-    docker image prune
+
-    ```
+* Pull the latest image at its tag and replace it with the same env variables in one run:
+
+  ```bash
+  docker run --rm \
+  -v /var/run/docker.sock:/var/run/docker.sock \
+  containrrr/watchtower \
+  --run-once heimdall
+  ```
+
+* You can also remove the old dangling images: `docker image prune`
+
+**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
 
 ### Image Update Notifications - Diun (Docker Image Update Notifier)
 
->[!TIP]
+* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
->We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
 
 ## Building locally
 
@@ -282,38 +229,38 @@ cd docker-heimdall
 docker build \
   --no-cache \
   --pull \
-  -t lscr.io/linuxserver/heimdall:development .
+  -t lscr.io/linuxserver/heimdall:latest .
 ```
 
-The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
+The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
 
 ```bash
-docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
+docker run --rm --privileged multiarch/qemu-user-static:register --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.
+* **04.11.22:** - Build commits to upstream branch 2.x for the `development` tag.
 * **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.
-* **15.07.19:** - Save laravel.log to /config, install heimdall during first start.
+* **16.07.19:** - Save laravel.log to /config/log/heimdall.
 * **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,10 +2,10 @@
 
 # jenkins variables
 project_name: docker-heimdall
-external_type: github_commit
+external_type: github_stable
-release_type: prerelease
+release_type: stable
-release_tag: development
+release_tag: latest
-ls_branch: development
+ls_branch: master
 repo_vars:
   - EXT_GIT_BRANCH = '2.x'
   - EXT_USER = 'linuxserver'
@@ -24,6 +24,6 @@ repo_vars:
   - CI_PORT='80'
   - CI_SSL='false'
   - CI_DELAY='120'
-  - CI_DOCKERENV=''
+  - CI_DOCKERENV='TZ=US/Pacific'
-  - CI_AUTH=''
+  - CI_AUTH='user:password'
   - CI_WEBPATH=''

package_versions.txt

@@ -1,252 +1,227 @@
 NAME                                VERSION                TYPE         
-Hidden Input                        1, 0, 0, 0             dotnet          
+alpine-baselayout                   3.4.0-r0               apk           
-alpine-baselayout                   3.6.5-r0               apk             
+alpine-baselayout-data              3.4.0-r0               apk           
-alpine-baselayout-data              3.6.5-r0               apk             
 alpine-keys                         2.4-r1                 apk           
-alpine-release                      3.20.5-r0              apk             
+alpine-release                      3.17.2-r0              apk           
-apache2-utils                       2.4.62-r0              apk             
+apache2-utils                       2.4.56-r0              apk           
-apk-tools                           2.14.4-r1              apk             
+apk-tools                           2.12.10-r1             apk           
-apr                                 1.7.5-r0               apk             
+apr                                 1.7.2-r0               apk           
-apr-util                            1.6.3-r1               apk             
+apr-util                            1.6.3-r0               apk           
-argon2-libs                         20190702-r5            apk             
+argon2-libs                         20190702-r2            apk           
-aws/aws-crt-php                     v1.2.4                 php-composer    
+barryvdh/laravel-ide-helper         v2.12.3                php-composer  
-aws/aws-sdk-php                     3.299.1                php-composer    
+barryvdh/reflection-docblock        v2.1.0                 php-composer  
-barryvdh/laravel-ide-helper         v2.15.1                php-composer    
+bash                                5.2.15-r0              apk           
-barryvdh/reflection-docblock        v2.1.1                 php-composer    
+brick/math                          0.9.3                  php-composer  
-bash                                5.2.26-r0              apk             
+brotli-libs                         1.0.9-r9               apk           
-brick/math                          0.11.0                 php-composer    
+busybox                             1.35.0                 binary        
-brotli-libs                         1.1.0-r2               apk             
+busybox                             1.35.0-r29             apk           
-busybox                             1.36.1-r29             apk             
+busybox-binsh                       1.35.0-r29             apk           
-busybox-binsh                       1.36.1-r29             apk             
+ca-certificates                     20220614-r4            apk           
-c-ares                              1.33.1-r0              apk             
+ca-certificates-bundle              20220614-r4            apk           
-ca-certificates                     20241121-r1            apk             
+clue/stream-filter                  v1.6.0                 php-composer  
-ca-certificates-bundle              20241121-r1            apk             
+composer/pcre                       3.1.0                  php-composer  
-carbonphp/carbon-doctrine-types     2.1.0                  php-composer    
+coreutils                           9.1-r0                 apk           
-catatonit                           0.2.0-r0               apk             
+curl                                7.88.1-r1              apk           
-clue/stream-filter                  v1.7.0                 php-composer    
-composer                            2.8.4                  binary          
-composer/class-map-generator        1.1.0                  php-composer    
-composer/pcre                       3.1.1                  php-composer    
-coreutils                           9.5-r2                 apk             
-coreutils-env                       9.5-r2                 apk             
-coreutils-fmt                       9.5-r2                 apk             
-coreutils-sha512sum                 9.5-r2                 apk             
-curl                                8.11.1-r0              apk             
 dflydev/dot-access-data             v3.0.2                 php-composer  
 doctrine/cache                      2.2.0                  php-composer  
-doctrine/dbal                       3.8.2                  php-composer    
+doctrine/dbal                       3.5.1                  php-composer  
-doctrine/deprecations               1.1.3                  php-composer    
+doctrine/deprecations               v1.0.0                 php-composer  
-doctrine/event-manager              2.0.0                  php-composer    
+doctrine/event-manager              1.2.0                  php-composer  
-doctrine/inflector                  2.0.9                  php-composer    
+doctrine/inflector                  2.0.6                  php-composer  
-doctrine/instantiator               2.0.0                  php-composer    
+doctrine/instantiator               1.4.1                  php-composer  
-doctrine/lexer                      3.0.1                  php-composer    
+doctrine/lexer                      1.2.3                  php-composer  
-dragonmantank/cron-expression       v3.3.3                 php-composer    
+dragonmantank/cron-expression       v3.3.2                 php-composer  
-egulias/email-validator             4.0.2                  php-composer    
+egulias/email-validator             2.1.25                 php-composer  
-fakerphp/faker                      v1.23.1                php-composer    
+facade/flare-client-php             1.10.0                 php-composer  
-filp/whoops                         2.15.4                 php-composer    
+facade/ignition                     2.17.6                 php-composer  
-findutils                           4.9.0-r5               apk             
+facade/ignition-contracts           1.0.2                  php-composer  
-fruitcake/php-cors                  v1.3.0                 php-composer    
+fideloper/proxy                     4.4.2                  php-composer  
-git                                 2.45.3-r0              apk             
+filp/whoops                         2.14.6                 php-composer  
-git-init-template                   2.45.3-r0              apk             
+fzaninotto/faker                    v1.9.2                 php-composer  
-gmp                                 6.3.0-r1               apk             
+git                                 2.38.4-r1              apk           
-graham-campbell/bounded-cache       v2.2.0                 php-composer    
+graham-campbell/bounded-cache       v1.3.0                 php-composer  
-graham-campbell/github              v12.4.0                php-composer    
+graham-campbell/github              v10.6.0                php-composer  
-graham-campbell/manager             v5.1.0                 php-composer    
+graham-campbell/manager             v4.7.0                 php-composer  
-graham-campbell/result-type         v1.1.2                 php-composer    
+graham-campbell/result-type         v1.1.0                 php-composer  
-guzzlehttp/guzzle                   7.8.1                  php-composer    
+guzzlehttp/guzzle                   7.5.0                  php-composer  
-guzzlehttp/promises                 2.0.2                  php-composer    
+guzzlehttp/promises                 1.5.2                  php-composer  
-guzzlehttp/psr7                     2.6.2                  php-composer    
+guzzlehttp/psr7                     2.4.3                  php-composer  
-guzzlehttp/uri-template             v1.0.3                 php-composer    
 hamcrest/hamcrest-php               v2.0.1                 php-composer  
-icu-data-en                         74.2-r0                apk             
+icu-data-en                         72.1-r1                apk           
-icu-libs                            74.2-r0                apk             
+icu-libs                            72.1-r1                apk           
-jq                                  1.7.1-r0               apk             
+jq                                  1.6-r2                 apk           
-knplabs/github-api                  v3.13.0                php-composer    
+knplabs/github-api                  v3.6.0                 php-composer  
-laravel/framework                   v10.44.0               php-composer    
+laravel/framework                   v8.83.26               php-composer  
-laravel/prompts                     v0.1.15                php-composer    
+laravel/serializable-closure        v1.2.2                 php-composer  
-laravel/serializable-closure        v1.3.3                 php-composer    
+laravel/tinker                      v2.7.3                 php-composer  
-laravel/tinker                      v2.9.0                 php-composer    
+laravel/ui                          v3.4.6                 php-composer  
-laravel/ui                          v4.4.0                 php-composer    
+laravelcollective/html              v6.3.0                 php-composer  
-laravelcollective/html              v6.4.1                 php-composer    
+league/commonmark                   2.3.7                  php-composer  
-lcobucci/jwt                        5.2.0                  php-composer    
+league/config                       v1.1.1                 php-composer  
-league/commonmark                   2.4.2                  php-composer    
+league/flysystem                    1.1.10                 php-composer  
-league/config                       v1.2.0                 php-composer    
+league/mime-type-detection          1.11.0                 php-composer  
-league/flysystem                    3.24.0                 php-composer    
+libacl                              2.3.1-r1               apk           
-league/flysystem-aws-s3-v3          3.24.0                 php-composer    
+libattr                             2.5.1-r2               apk           
-league/flysystem-local              3.23.1                 php-composer    
+libbsd                              0.11.7-r0              apk           
-league/mime-type-detection          1.15.0                 php-composer    
+libbz2                              1.0.8-r4               apk           
-libacl                              2.3.2-r0               apk             
+libc-utils                          0.7.2-r3               apk           
-libattr                             2.5.2-r0               apk             
+libcrypto3                          3.0.8-r3               apk           
-libbsd                              0.12.2-r0              apk             
+libcurl                             7.88.1-r1              apk           
-libbz2                              1.0.8-r6               apk             
+libedit                             20221030.3.1-r0        apk           
-libcrypto3                          3.3.2-r1               apk             
+libexpat                            2.5.0-r0               apk           
-libcurl                             8.11.1-r0              apk             
+libgcc                              12.2.1_git20220924-r4  apk           
-libedit                             20240517.3.1-r0        apk             
+libintl                             0.21.1-r1              apk           
-libexpat                            2.6.4-r0               apk             
+libmd                               1.0.4-r0               apk           
-libgcc                              13.2.1_git20240309-r0  apk             
+libpq                               15.2-r0                apk           
-libidn2                             2.3.7-r0               apk             
+libproc                             3.3.17-r2              apk           
-libintl                             0.22.5-r0              apk             
+libssl3                             3.0.8-r3               apk           
-libmd                               1.1.0-r0               apk             
+libstdc++                           12.2.1_git20220924-r4  apk           
-libncursesw                         6.4_p20240420-r2       apk             
+libuuid                             2.38.1-r1              apk           
-libpq                               16.6-r0                apk             
+libxml2                             2.10.3-r1              apk           
-libproc2                            4.0.4-r0               apk             
+libzip                              1.9.2-r2               apk           
-libpsl                              0.21.5-r1              apk             
+linux-pam                           1.5.2-r1               apk           
-libssl3                             3.3.2-r1               apk             
+logrotate                           3.20.1-r3              apk           
-libstdc++                           13.2.1_git20240309-r0  apk             
+mockery/mockery                     1.5.1                  php-composer  
-libunistring                        1.2-r0                 apk             
+monolog/monolog                     2.8.0                  php-composer  
-libuuid                             2.40.1-r1              apk             
+musl                                1.2.3-r4               apk           
-libxml2                             2.12.7-r0              apk             
+musl-utils                          1.2.3-r4               apk           
-libzip                              1.10.1-r0              apk             
+myclabs/deep-copy                   1.11.0                 php-composer  
-linux-pam                           1.6.0-r0               apk             
+nano                                7.0-r0                 apk           
-logrotate                           3.21.0-r1              apk             
+ncurses-libs                        6.3_p20221119-r0       apk           
-mockery/mockery                     1.6.7                  php-composer    
+ncurses-terminfo-base               6.3_p20221119-r0       apk           
-monolog/monolog                     3.5.0                  php-composer    
+nesbot/carbon                       2.63.0                 php-composer  
-mtdowling/jmespath.php              2.7.0                  php-composer    
+netcat-openbsd                      1.130-r4               apk           
-musl                                1.2.5-r0               apk             
+nette/schema                        v1.2.3                 php-composer  
-musl-utils                          1.2.5-r0               apk             
+nette/utils                         v3.2.8                 php-composer  
-myclabs/deep-copy                   1.11.1                 php-composer    
+nghttp2-libs                        1.51.0-r0              apk           
-nano                                8.0-r0                 apk             
+nginx                               1.22.1-r0              apk           
-ncurses-terminfo-base               6.4_p20240420-r2       apk             
+nikic/php-parser                    v4.15.2                php-composer  
-nesbot/carbon                       2.72.3                 php-composer    
+nunomaduro/collision                v5.11.0                php-composer  
-netcat-openbsd                      1.226-r0               apk             
+oniguruma                           6.9.8-r0               apk           
-nette/schema                        v1.3.0                 php-composer    
+openssl                             3.0.8-r3               apk           
-nette/utils                         v4.0.4                 php-composer    
+opis/closure                        3.6.3                  php-composer  
-nghttp2-libs                        1.62.1-r0              apk             
+pcre                                8.45-r2                apk           
-nginx                               1.26.2-r0              apk             
+pcre2                               10.42-r0               apk           
-nikic/php-parser                    v5.0.0                 php-composer    
-nunomaduro/collision                v6.4.0                 php-composer    
-nunomaduro/termwind                 v1.15.1                php-composer    
-oniguruma                           6.9.9-r0               apk             
-openssl                             3.3.2-r1               apk             
-pcre                                8.45-r3                apk             
-pcre2                               10.43-r0               apk             
 phar-io/manifest                    2.0.3                  php-composer  
 phar-io/version                     3.2.1                  php-composer  
-php-http/cache-plugin               1.8.1                  php-composer    
+php-cli                             8.1.17                 binary        
-php-http/client-common              2.7.1                  php-composer    
+php-fpm                             8.1.17                 binary        
-php-http/discovery                  1.19.2                 php-composer    
+php-http/cache-plugin               1.7.5                  php-composer  
-php-http/httplug                    2.4.0                  php-composer    
+php-http/client-common              2.6.0                  php-composer  
-php-http/message                    1.16.0                 php-composer    
+php-http/discovery                  1.14.3                 php-composer  
-php-http/message-factory            1.1.0                  php-composer    
+php-http/httplug                    2.3.0                  php-composer  
-php-http/multipart-stream-builder   1.3.0                  php-composer    
+php-http/message                    1.13.0                 php-composer  
-php-http/promise                    1.3.0                  php-composer    
+php-http/message-factory            v1.0.2                 php-composer  
-php83                               8.3.15-r0              apk             
+php-http/multipart-stream-builder   1.2.0                  php-composer  
-php83-common                        8.3.15-r0              apk             
+php-http/promise                    1.1.0                  php-composer  
-php83-ctype                         8.3.15-r0              apk             
+php81                               8.1.17-r0              apk           
-php83-curl                          8.3.15-r0              apk             
+php81-common                        8.1.17-r0              apk           
-php83-dom                           8.3.15-r0              apk             
+php81-ctype                         8.1.17-r0              apk           
-php83-fileinfo                      8.3.15-r0              apk             
+php81-curl                          8.1.17-r0              apk           
-php83-fpm                           8.3.15-r0              apk             
+php81-fileinfo                      8.1.17-r0              apk           
-php83-iconv                         8.3.15-r0              apk             
+php81-fpm                           8.1.17-r0              apk           
-php83-intl                          8.3.15-r0              apk             
+php81-intl                          8.1.17-r0              apk           
-php83-mbstring                      8.3.15-r0              apk             
+php81-mbstring                      8.1.17-r0              apk           
-php83-mysqlnd                       8.3.15-r0              apk             
+php81-mysqlnd                       8.1.17-r0              apk           
-php83-opcache                       8.3.15-r0              apk             
+php81-openssl                       8.1.17-r0              apk           
-php83-openssl                       8.3.15-r0              apk             
+php81-pdo                           8.1.17-r0              apk           
-php83-pdo                           8.3.15-r0              apk             
+php81-pdo_mysql                     8.1.17-r0              apk           
-php83-pdo_mysql                     8.3.15-r0              apk             
+php81-pdo_pgsql                     8.1.17-r0              apk           
-php83-pdo_pgsql                     8.3.15-r0              apk             
+php81-pdo_sqlite                    8.1.17-r0              apk           
-php83-pdo_sqlite                    8.3.15-r0              apk             
+php81-session                       8.1.17-r0              apk           
-php83-phar                          8.3.15-r0              apk             
+php81-simplexml                     8.1.17-r0              apk           
-php83-session                       8.3.15-r0              apk             
+php81-tokenizer                     8.1.17-r0              apk           
-php83-simplexml                     8.3.15-r0              apk             
+php81-xml                           8.1.17-r0              apk           
-php83-tokenizer                     8.3.15-r0              apk             
+php81-xmlwriter                     8.1.17-r0              apk           
-php83-xml                           8.3.15-r0              apk             
+php81-zip                           8.1.17-r0              apk           
-php83-xmlwriter                     8.3.15-r0              apk             
-php83-zip                           8.3.15-r0              apk             
 phpdocumentor/reflection-common     2.2.0                  php-composer  
-phpdocumentor/type-resolver         1.8.0                  php-composer    
+phpdocumentor/type-resolver         1.6.2                  php-composer  
-phpoption/phpoption                 1.9.2                  php-composer    
+phpoption/phpoption                 1.9.0                  php-composer  
-phpstan/phpdoc-parser               1.25.0                 php-composer    
+phpunit/php-code-coverage           9.2.19                 php-composer  
-phpunit/php-code-coverage           9.2.30                 php-composer    
 phpunit/php-file-iterator           3.0.6                  php-composer  
 phpunit/php-invoker                 3.1.1                  php-composer  
 phpunit/php-text-template           2.0.4                  php-composer  
 phpunit/php-timer                   5.0.3                  php-composer  
-phpunit/phpunit                     9.6.16                 php-composer    
+phpunit/phpunit                     9.5.26                 php-composer  
-popt                                1.19-r3                apk             
+popt                                1.19-r0                apk           
-procps-ng                           4.0.4-r0               apk             
+procps                              3.3.17-r2              apk           
-psr/cache                           3.0.0                  php-composer    
+psr/cache                           1.0.1                  php-composer  
-psr/clock                           1.0.0                  php-composer    
+psr/container                       1.1.2                  php-composer  
-psr/container                       2.0.2                  php-composer    
 psr/event-dispatcher                1.0.0                  php-composer  
-psr/http-client                     1.0.3                  php-composer    
+psr/http-client                     1.0.1                  php-composer  
-psr/http-factory                    1.0.2                  php-composer    
+psr/http-factory                    1.0.1                  php-composer  
-psr/http-message                    2.0                    php-composer    
+psr/http-message                    1.0.1                  php-composer  
-psr/log                             3.0.0                  php-composer    
+psr/log                             1.1.4                  php-composer  
-psr/simple-cache                    3.0.0                  php-composer    
+psr/simple-cache                    1.0.1                  php-composer  
-psy/psysh                           v0.12.0                php-composer    
+psy/psysh                           v0.11.9                php-composer  
 ralouphie/getallheaders             3.0.3                  php-composer  
-ramsey/collection                   2.0.0                  php-composer    
+ramsey/collection                   1.2.2                  php-composer  
-ramsey/uuid                         4.7.5                  php-composer    
+ramsey/uuid                         4.2.3                  php-composer  
-readline                            8.2.10-r0              apk             
+readline                            8.2.0-r0               apk           
-scanelf                             1.3.7-r2               apk             
+scanelf                             1.3.5-r1               apk           
 sebastian/cli-parser                1.0.1                  php-composer  
 sebastian/code-unit                 1.0.8                  php-composer  
 sebastian/code-unit-reverse-lookup  2.0.3                  php-composer  
 sebastian/comparator                4.0.8                  php-composer  
-sebastian/complexity                2.0.3                  php-composer    
+sebastian/complexity                2.0.2                  php-composer  
-sebastian/diff                      4.0.5                  php-composer    
+sebastian/diff                      4.0.4                  php-composer  
-sebastian/environment               5.1.5                  php-composer    
+sebastian/environment               5.1.4                  php-composer  
 sebastian/exporter                  4.0.5                  php-composer  
-sebastian/global-state              5.0.6                  php-composer    
+sebastian/global-state              5.0.5                  php-composer  
-sebastian/lines-of-code             1.0.4                  php-composer    
+sebastian/lines-of-code             1.0.3                  php-composer  
 sebastian/object-enumerator         4.0.4                  php-composer  
 sebastian/object-reflector          2.0.4                  php-composer  
-sebastian/recursion-context         4.0.5                  php-composer    
+sebastian/recursion-context         4.0.4                  php-composer  
 sebastian/resource-operations       3.0.3                  php-composer  
-sebastian/type                      3.2.1                  php-composer    
+sebastian/type                      3.2.0                  php-composer  
 sebastian/version                   3.0.2                  php-composer  
-shadow                              4.15.1-r0              apk             
+shadow                              4.13-r0                apk           
-skalibs                             2.14.1.1-r0            apk             
+skalibs                             2.12.0.1-r0            apk           
-spatie/backtrace                    1.5.3                  php-composer    
+sqlite-libs                         3.40.1-r0              apk           
-spatie/flare-client-php             1.4.4                  php-composer    
+squizlabs/php_codesniffer           3.7.1                  php-composer  
-spatie/ignition                     1.12.0                 php-composer    
+ssl_client                          1.35.0-r29             apk           
-spatie/laravel-ignition             2.4.2                  php-composer    
+swiftmailer/swiftmailer             v6.3.0                 php-composer  
-sqlite-libs                         3.45.3-r1              apk             
+symfony/cache                       v5.4.15                php-composer  
-squizlabs/php_codesniffer           3.9.0                  php-composer    
+symfony/cache-contracts             v2.5.2                 php-composer  
-ssl_client                          1.36.1-r29             apk             
+symfony/console                     v5.4.15                php-composer  
-symfony/cache                       v6.4.3                 php-composer    
+symfony/css-selector                v5.4.11                php-composer  
-symfony/cache-contracts             v3.4.0                 php-composer    
+symfony/deprecation-contracts       v2.5.2                 php-composer  
-symfony/console                     v6.4.3                 php-composer    
+symfony/error-handler               v5.4.15                php-composer  
-symfony/css-selector                v7.0.3                 php-composer    
+symfony/event-dispatcher            v5.4.9                 php-composer  
-symfony/deprecation-contracts       v3.4.0                 php-composer    
+symfony/event-dispatcher-contracts  v2.5.2                 php-composer  
-symfony/error-handler               v6.4.3                 php-composer    
+symfony/finder                      v5.4.11                php-composer  
-symfony/event-dispatcher            v7.0.3                 php-composer    
+symfony/http-foundation             v5.4.15                php-composer  
-symfony/event-dispatcher-contracts  v3.4.0                 php-composer    
+symfony/http-kernel                 v5.4.15                php-composer  
-symfony/finder                      v6.4.0                 php-composer    
+symfony/mime                        v5.4.14                php-composer  
-symfony/http-foundation             v6.4.3                 php-composer    
+symfony/options-resolver            v5.4.11                php-composer  
-symfony/http-kernel                 v6.4.3                 php-composer    
+symfony/polyfill-ctype              v1.27.0                php-composer  
-symfony/mailer                      v6.4.3                 php-composer    
+symfony/polyfill-iconv              v1.27.0                php-composer  
-symfony/mime                        v6.4.3                 php-composer    
+symfony/polyfill-intl-grapheme      v1.27.0                php-composer  
-symfony/options-resolver            v7.0.0                 php-composer    
+symfony/polyfill-intl-idn           v1.27.0                php-composer  
-symfony/polyfill-ctype              v1.29.0                php-composer    
+symfony/polyfill-intl-normalizer    v1.27.0                php-composer  
-symfony/polyfill-intl-grapheme      v1.29.0                php-composer    
+symfony/polyfill-mbstring           v1.27.0                php-composer  
-symfony/polyfill-intl-idn           v1.29.0                php-composer    
+symfony/polyfill-php72              v1.27.0                php-composer  
-symfony/polyfill-intl-normalizer    v1.29.0                php-composer    
+symfony/polyfill-php73              v1.27.0                php-composer  
-symfony/polyfill-mbstring           v1.29.0                php-composer    
+symfony/polyfill-php80              v1.27.0                php-composer  
-symfony/polyfill-php72              v1.29.0                php-composer    
+symfony/polyfill-php81              v1.27.0                php-composer  
-symfony/polyfill-php80              v1.29.0                php-composer    
+symfony/process                     v5.4.11                php-composer  
-symfony/polyfill-php83              v1.29.0                php-composer    
+symfony/routing                     v5.4.15                php-composer  
-symfony/polyfill-uuid               v1.29.0                php-composer    
+symfony/service-contracts           v2.5.2                 php-composer  
-symfony/process                     v6.4.3                 php-composer    
+symfony/string                      v5.4.15                php-composer  
-symfony/routing                     v6.4.3                 php-composer    
-symfony/service-contracts           v3.4.1                 php-composer    
-symfony/string                      v7.0.3                 php-composer    
 symfony/thanks                      v1.2.10                php-composer  
-symfony/translation                 v6.4.3                 php-composer    
+symfony/translation                 v5.4.14                php-composer  
-symfony/translation-contracts       v3.4.1                 php-composer    
+symfony/translation-contracts       v2.5.2                 php-composer  
-symfony/uid                         v6.4.3                 php-composer    
+symfony/var-dumper                  v5.4.14                php-composer  
-symfony/var-dumper                  v6.4.3                 php-composer    
+symfony/var-exporter                v5.4.10                php-composer  
-symfony/var-exporter                v7.0.3                 php-composer    
+symfony/yaml                        v5.4.14                php-composer  
-symfony/yaml                        v6.4.3                 php-composer    
+theseer/tokenizer                   1.2.1                  php-composer  
-theseer/tokenizer                   1.2.2                  php-composer    
+tijsverkoyen/css-to-inline-styles   2.2.5                  php-composer  
-tijsverkoyen/css-to-inline-styles   v2.2.7                 php-composer    
+tzdata                              2023b-r1               apk           
-tzdata                              2024b-r0               apk             
+utmps-libs                          0.1.2.0-r1             apk           
-utmps-libs                          0.1.2.2-r1             apk             
+vlucas/phpdotenv                    v5.5.0                 php-composer  
-vlucas/phpdotenv                    v5.6.0                 php-composer    
+voku/portable-ascii                 1.6.1                  php-composer  
-voku/portable-ascii                 2.0.1                  php-composer    
 webmozart/assert                    1.11.0                 php-composer  
-xz-libs                             5.6.2-r0               apk             
+xz                                  5.2.9-r0               apk           
-zlib                                1.3.1-r1               apk             
+xz-libs                             5.2.9-r0               apk           
-zstd-libs                           1.5.6-r0               apk             
+zlib                                1.2.13-r0              apk           
+zstd-libs                           1.5.2-r9               apk           

readme-vars.yml

@@ -11,117 +11,70 @@ 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"}
+  - { arch: "{{ arch_armhf }}", tag: "arm32v7-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/appdata/config", desc: "Contains all relevant configuration 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.
-# 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: "27.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
+  - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
-  - {date: "07.03.24:", desc: "Enable the opcache and disable file revalidation."}
+  - { 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: "06.03.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf."}
+  - { date: "04.11.22:", desc: "Build commits to upstream branch 2.x for the `development` tag." }
-  - {date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}
+  - { date: "13.03.21:", desc: "Make searchproviders.yaml user configurable." }
-  - {date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf."}
+  - { date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel." }
-  - {date: "13.04.23:", desc: "Move ssl.conf include to default.conf."}
+  - { date: "10.02.21:", desc: "Rebasing to alpine 3.13." }
-  - {date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1."}
+  - { date: "17.08.20:", desc: "Add php7-curl." }
-  - {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: "01.06.20:", desc: "Rebasing to alpine 3.12." }
-  - {date: "04.11.22:", desc: "Build commits to upstream branch 2.x."}
+  - { date: "17.01.20:", desc: "Use nginx from baseimage." }
-  - {date: "13.03.21:", desc: "Make searchproviders.yaml user configurable."}
+  - { date: "19.12.19:", desc: "Rebasing to alpine 3.11." }
-  - {date: "11.03.21:", desc: "Rebase to alpine 3.14."}
+  - { date: "16.07.19:", desc: "Save laravel.log to /config/log/heimdall." }
-  - {date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel."}
+  - { date: "28.06.19:", desc: "Rebasing to alpine 3.10." }
-  - {date: "10.02.21:", desc: "Rebasing to alpine 3.13."}
+  - { date: "01.04.19:", desc: "Fix permission detect logic." }
-  - {date: "01.06.20:", desc: "Rebasing to alpine 3.12."}
+  - { date: "26.03.19:", desc: "Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown." }
-  - {date: "19.12.19:", desc: "Rebasing to alpine 3.11."}
+  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
-  - {date: "15.07.19:", desc: "Save laravel.log to /config, install heimdall during first start."}
+  - { date: "15.03.19:", desc: "Clarify docker image tags in readme." }
-  - {date: "28.06.19:", desc: "Rebasing to alpine 3.10."}
+  - { date: "22.02.19:", desc: "Rebasing to alpine 3.9." }
-  - {date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag."}
+  - { date: "16.01.18:", desc: "Generate random app key in .env for new installs." }
-  - {date: "22.02.19:", desc: "Rebasing to alpine 3.9."}
+  - { date: "20.11.18:", desc: "Upgrade baseimage packages during build." }
-  - {date: "04.11.18:", desc: "Add php7-zip."}
+  - { date: "04.11.18:", desc: "Add php7-zip." }
-  - {date: "31.10.18:", desc: "Add queue service."}
+  - { date: "31.10.18:", desc: "Add queue service." }
-  - {date: "17.10.18:", desc: "Symlink avatars folder."}
+  - { date: "17.10.18:", desc: "Symlink avatars folder." }
-  - {date: "16.10.18:", desc: "Updated fastcgi_params for user login support."}
+  - { date: "16.10.18:", desc: "Updated fastcgi_params for user login support." }
-  - {date: "07.10.18:", desc: "Symlink `.env` rather than copy. It now resides under `/config/www`"}
+  - { date: "07.10.18:", desc: "Symlink `.env` rather than copy. It now resides under `/config/www`" }
-  - {date: "30.09.18:", desc: "Multi-arch image. Move `.env` to `/config`."}
+  - { date: "30.09.18:", desc: "Multi-arch image. Move `.env` to `/config`." }
-  - {date: "05.09.18:", desc: "Rebase to alpine linux 3.8."}
+  - { 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: "06.03.18:", desc: "Use password protection if htpasswd is set. Existing users can delete their default site config at /config/nginx/site-confs/default.conf and restart the container, a new default site config with htpasswd support will be created in its place" }
-  - {date: "12.02.18:", desc: "Initial Release."}
+  - { date: "12.02.18:", desc: "Initial Release." }

root/defaults/nginx/site-confs/default.conf.sample

@@ -0,0 +1,34 @@
+## Version 2022/11/14 - 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 _;
+
+    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;
+    }
+}

root/migrations/02-default-location

@@ -5,7 +5,7 @@ DEFAULT_CONF="/config/nginx/site-confs/default.conf"
 OLD_ROOT="root /var/www/localhost/heimdall/public;"
 NEW_ROOT="root /app/www/public;"
 
-if [[ -f "${DEFAULT_CONF}" ]] && grep -q "${OLD_ROOT}" "${DEFAULT_CONF}" 2>/dev/null; then
+if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}" 2>/dev/null; then
     echo "updating root in ${DEFAULT_CONF}"
     sed -i "s|${OLD_ROOT}|${NEW_ROOT}|" "${DEFAULT_CONF}"
 fi