Bot Updating Package Versions

.github/CONTRIBUTING.md

@@ -6,7 +6,7 @@
 * Read, and fill the Pull Request template
   * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
   * If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
-* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
+* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://linuxserver.io/discord)
 
 ## Common files
 

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Discord chat support
-    url: https://discord.gg/YWrKVTn
+    url: https://linuxserver.io/discord
     about: Realtime support / chat with the community and the team.
 
   - name: Discourse discussion forum

.github/workflows/call_issue_pr_tracker.yml

@@ -8,6 +8,9 @@ on:
   pull_request_review:
     types: [submitted,edited,dismissed]
 
+permissions:
+  contents: read
+
 jobs:
   manage-project:
     permissions:

.github/workflows/call_issues_cron.yml

@@ -4,6 +4,9 @@ on:
     - cron:  '14 15 * * *'
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   stale:
     permissions:

.github/workflows/external_trigger.yml

@@ -3,6 +3,9 @@ name: External Trigger Main
 on:
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   external-trigger-development:
     runs-on: ubuntu-latest
@@ -15,7 +18,10 @@ jobs:
           SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
         run: |
           printf "# External trigger for docker-heimdall\n\n" >> $GITHUB_STEP_SUMMARY
-          if grep -q "^heimdall_development" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+          if grep -q "^heimdall_development_" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+            echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY
+            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`heimdall_development_\`; will skip trigger if version matches." >> $GITHUB_STEP_SUMMARY
+          elif grep -q "^heimdall_development" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
             echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`heimdall_development\`; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
@@ -25,6 +31,11 @@ jobs:
           printf "\n## Retrieving external version\n\n" >> $GITHUB_STEP_SUMMARY
           EXT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/2.x" | jq -r '. | .sha' | cut -c1-8)
           echo "Type is \`github_commit\`" >> $GITHUB_STEP_SUMMARY
+          if grep -q "^heimdall_development_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+            echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY
+            exit 0
+          fi
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
             echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
@@ -35,8 +46,8 @@ jobs:
               "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
             exit 1
           fi
-          EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
-          echo "External version: \`${EXT_RELEASE}\`" >> $GITHUB_STEP_SUMMARY
+          EXT_RELEASE_SANITIZED=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
+          echo "Sanitized external version: \`${EXT_RELEASE_SANITIZED}\`" >> $GITHUB_STEP_SUMMARY
           echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
           image="linuxserver/heimdall"
           tag="development"
@@ -48,13 +59,30 @@ jobs:
             --header "Accept: application/vnd.oci.image.index.v1+json" \
             --header "Authorization: Bearer ${token}" \
             "https://ghcr.io/v2/${image}/manifests/${tag}")
-          multidigest=$(jq -r ".manifests[] | select(.platform.architecture == \"amd64\").digest?" <<< "${multidigest}")
-          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}" \
-            | jq -r '.config.digest')
+          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
+              digest=$(jq -r '.config.digest' <<< "${digest}");
+            fi
+          fi
           image_info=$(curl -sL \
             --header "Authorization: Bearer ${token}" \
             "https://ghcr.io/v2/${image}/blobs/${digest}")
@@ -75,8 +103,8 @@ jobs:
             exit 1
           fi
           echo "Last pushed version: \`${IMAGE_VERSION}\`" >> $GITHUB_STEP_SUMMARY
-          if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
-            echo "Version \`${EXT_RELEASE}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
+          if [ "${EXT_RELEASE_SANITIZED}" == "${IMAGE_VERSION}" ]; then
+            echo "Sanitized version \`${EXT_RELEASE_SANITIZED}\` already pushed, exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
           elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/lastBuild/api/json | jq -r '.building') == "true" ]; then
             echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
@@ -91,8 +119,8 @@ jobs:
                 "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
             else
               printf "\n## Trigger new build\n\n" >> $GITHUB_STEP_SUMMARY
-              echo "New version \`${EXT_RELEASE}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
-              if "${artifacts_found}" == "true" ]]; then
+              echo "New sanitized version \`${EXT_RELEASE_SANITIZED}\` found; old version was \`${IMAGE_VERSION}\`. Triggering new build" >> $GITHUB_STEP_SUMMARY
+              if [[ "${artifacts_found}" == "true" ]]; then
                 echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
               fi
               response=$(curl -iX POST \
@@ -111,7 +139,7 @@ jobs:
                 --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}"
+              TRIGGER_REASON="A version change was detected for heimdall tag development. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE_SANITIZED}"
               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 }}

.github/workflows/external_trigger_scheduler.yml

@@ -5,6 +5,9 @@ on:
     - cron:  '39 * * * *'
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   external-trigger-scheduler:
     runs-on: ubuntu-latest

.github/workflows/greetings.yml

@@ -2,8 +2,14 @@ name: Greetings
 
 on: [pull_request_target, issues]
 
+permissions:
+  contents: read
+
 jobs:
   greeting:
+    permissions:
+      issues: write
+      pull-requests: write
     runs-on: ubuntu-latest
     steps:
     - uses: actions/first-interaction@v1

.github/workflows/package_trigger_scheduler.yml

@@ -5,6 +5,9 @@ on:
     - cron:  '14 18 * * 5'
   workflow_dispatch:
 
+permissions:
+  contents: read
+
 jobs:
   package-trigger-scheduler:
     runs-on: ubuntu-latest
@@ -27,9 +30,18 @@ jobs:
             fi
             printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY
             JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml)
-            if [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
+            if ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/Jenkinsfile >/dev/null 2>&1; then
+              echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+              echo "> No Jenkinsfile found. Branch is either deprecated or is an early dev branch." >> $GITHUB_STEP_SUMMARY
+              skipped_branches="${skipped_branches}${br} "
+            elif [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then
               echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY
-              if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then
+              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} "
@@ -37,7 +49,7 @@ jobs:
                 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') == "true" ]; then
+              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} "
@@ -49,6 +61,11 @@ jobs:
                 response=$(curl -iX POST \
                   https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/${br}/buildWithParameters?PACKAGE_CHECK=true \
                   --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
+                if [[ -z "${response}" ]]; then
+                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                  echo "> Jenkins build could not be triggered. Skipping branch."
+                  continue
+                fi
                 echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
                 echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
                 sleep 10
@@ -56,11 +73,14 @@ jobs:
                 buildurl="${buildurl%$'\r'}"
                 echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY
                 echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY
-                curl -iX POST \
+                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"
+                  --data-urlencode "Submit=Submit"; then
+                  echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
+                  echo "> Unable to change the Jenkins job description."
+                fi
                 sleep 20
               fi
             else

Jenkinsfile

@@ -59,11 +59,23 @@ pipeline {
       steps{
         echo "Running on node: ${NODE_NAME}"
         sh '''#! /bin/bash
-              containers=$(docker ps -aq)
+              echo "Pruning builder"
+              docker builder prune -f --builder container || :
+              containers=$(docker ps -q)
               if [[ -n "${containers}" ]]; then
-                docker stop ${containers}
+                BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
+                for container in ${containers}; do
+                  if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
+                    echo "skipping buildx container in docker stop"
+                  else
+                    echo "Stopping container ${container}"
+                    docker stop ${container}
+                  fi
+                done
               fi
-              docker system prune -af --volumes || : '''
+              docker system prune -f --volumes || :
+              docker image prune -af || :
+           '''
         script{
           env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
@@ -85,7 +97,11 @@ pipeline {
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
           env.PULL_REQUEST = env.CHANGE_ID
           env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml'
+          if ( env.SYFT_IMAGE_TAG == null ) {
+            env.SYFT_IMAGE_TAG = 'latest'
+          }
         }
+        echo "Using syft image tag ${SYFT_IMAGE_TAG}"
         sh '''#! /bin/bash
               echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
         script{
@@ -585,7 +601,7 @@ pipeline {
           --label \"org.opencontainers.image.title=Heimdall\" \
           --label \"org.opencontainers.image.description=[Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way.    Simplicity is the key to Heimdall.    Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.  \" \
           --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
-          --provenance=false --sbom=false --builder=container --load \
+          --provenance=true --sbom=true --builder=container --load \
           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
         sh '''#! /bin/bash
               set -e
@@ -614,7 +630,9 @@ pipeline {
                       for i in "${CACHE[@]}"; do
                         docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
                       done
-                      wait
+                      for p in $(jobs -p); do
+                        wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                      done
                     fi
                 '''
           }
@@ -649,7 +667,7 @@ pipeline {
               --label \"org.opencontainers.image.title=Heimdall\" \
               --label \"org.opencontainers.image.description=[Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way.    Simplicity is the key to Heimdall.    Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.  \" \
               --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
-              --provenance=false --sbom=false --builder=container --load \
+              --provenance=true --sbom=true --builder=container --load \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
             sh '''#! /bin/bash
                   set -e
@@ -678,7 +696,9 @@ pipeline {
                           for i in "${CACHE[@]}"; do
                             docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
                           done
-                          wait
+                          for p in $(jobs -p); do
+                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                          done
                         fi
                     '''
               }
@@ -706,7 +726,7 @@ pipeline {
               --label \"org.opencontainers.image.title=Heimdall\" \
               --label \"org.opencontainers.image.description=[Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way.    Simplicity is the key to Heimdall.    Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.  \" \
               --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
-              --provenance=false --sbom=false --builder=container --load \
+              --provenance=true --sbom=true --builder=container --load \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
             sh '''#! /bin/bash
                   set -e
@@ -735,7 +755,9 @@ pipeline {
                           for i in "${CACHE[@]}"; do
                             docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
                           done
-                          wait
+                          for p in $(jobs -p); do
+                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                          done
                         fi
                     '''
               }
@@ -745,7 +767,8 @@ pipeline {
                   if [[ -n "${containers}" ]]; then
                     docker stop ${containers}
                   fi
-                  docker system prune -af --volumes || :
+                  docker system prune -f --volumes || :
+                  docker image prune -af || :
                '''
           }
         }
@@ -771,7 +794,7 @@ pipeline {
               docker run --rm \
                 -v /var/run/docker.sock:/var/run/docker.sock:ro \
                 -v ${TEMPDIR}:/tmp \
-                ghcr.io/anchore/syft:latest \
+                ghcr.io/anchore/syft:${SYFT_IMAGE_TAG} \
                 ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
               NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
               echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
@@ -881,6 +904,7 @@ pipeline {
                 -e WEB_AUTH=\"${CI_AUTH}\" \
                 -e WEB_PATH=\"${CI_WEBPATH}\" \
                 -e NODE_NAME=\"${NODE_NAME}\" \
+                -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \
                 -t ghcr.io/linuxserver/ci:latest \
                 python3 test_build.py'''
         }
@@ -978,7 +1002,7 @@ pipeline {
               echo '{"tag_name":"'${META_TAG}'",\
                      "target_commitish": "development",\
                      "name": "'${META_TAG}'",\
-                     "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
+                     "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
               printf '","draft": false,"prerelease": true}' >> releasebody.json
               paste -d'\\0' start releasebody.json > releasebody.json.done
               curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
@@ -1156,12 +1180,22 @@ EOF
     }
     cleanup {
       sh '''#! /bin/bash
-            echo "Performing docker system prune!!"
-            containers=$(docker ps -aq)
+            echo "Pruning builder!!"
+            docker builder prune -f --builder container || :
+            containers=$(docker ps -q)
             if [[ -n "${containers}" ]]; then
-              docker stop ${containers}
+              BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit')
+              for container in ${containers}; do
+                if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then
+                  echo "skipping buildx container in docker stop"
+                else
+                  echo "Stopping container ${container}"
+                  docker stop ${container}
+                fi
+              done
             fi
-            docker system prune -af --volumes || :
+            docker system prune -f --volumes || :
+            docker image prune -af || :
          '''
       cleanWs()
     }

README.md

@@ -3,9 +3,8 @@
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 
 [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
-[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
+[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://linuxserver.io/discord "realtime support / chat with the community and the team.")
 [![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.")
-[![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
 [![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.")
 [![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
 
@@ -20,9 +19,8 @@ The [LinuxServer.io](https://linuxserver.io) team brings you another container r
 Find us at:
 
 * [Blog](https://blog.linuxserver.io) - all the things you can do with our containers including How-To guides, opinions and much more!
-* [Discord](https://discord.gg/YWrKVTn) - realtime support / chat with the community and the team.
+* [Discord](https://linuxserver.io/discord) - realtime support / chat with the community and the team.
 * [Discourse](https://discourse.linuxserver.io) - post on our community forum.
-* [Fleet](https://fleet.linuxserver.io) - an online web interface which displays all of our maintained images.
 * [GitHub](https://github.com/linuxserver) - view the source for all of our repositories.
 * [Open Collective](https://opencollective.com/linuxserver) - please consider helping us by either donating or contributing to our budget
 
@@ -59,7 +57,6 @@ The architectures supported by this image are:
 | :----: | :----: | ---- |
 | x86-64 | ✅ | amd64-\<version tag\> |
 | arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf | ❌ | |
 
 ## Version Tags
 

package_versions.txt

@@ -1,168 +1,161 @@
 NAME                                VERSION                TYPE           
-Hidden Input                        1, 0, 0, 0             dotnet          
+Hidden Input                        1, 0, 0, 0             binary          
 alpine-baselayout                   3.6.5-r0               apk             
 alpine-baselayout-data              3.6.5-r0               apk             
 alpine-keys                         2.4-r1                 apk             
-alpine-release                      3.20.3-r0              apk             
+alpine-release                      3.20.6-r0              apk             
 apache2-utils                       2.4.62-r0              apk             
-apk-tools                           2.14.4-r0              apk             
+apk-tools                           2.14.4-r1              apk             
 apr                                 1.7.5-r0               apk             
 apr-util                            1.6.3-r1               apk             
 argon2-libs                         20190702-r5            apk             
-aws/aws-crt-php                     v1.2.4                 php-composer    
-aws/aws-sdk-php                     3.299.1                php-composer    
-barryvdh/laravel-ide-helper         v2.15.1                php-composer    
-barryvdh/reflection-docblock        v2.1.1                 php-composer    
+aws/aws-crt-php                     v1.2.7                 php-composer    
+aws/aws-sdk-php                     3.349.3                php-composer    
+barryvdh/laravel-ide-helper         v3.5.5                 php-composer    
+barryvdh/reflection-docblock        v2.3.1                 php-composer    
 bash                                5.2.26-r0              apk             
-brick/math                          0.11.0                 php-composer    
+brick/math                          0.12.3                 php-composer    
 brotli-libs                         1.1.0-r2               apk             
 busybox                             1.36.1-r29             apk             
 busybox-binsh                       1.36.1-r29             apk             
 c-ares                              1.33.1-r0              apk             
-ca-certificates                     20240705-r0            apk             
-ca-certificates-bundle              20240705-r0            apk             
-carbonphp/carbon-doctrine-types     2.1.0                  php-composer    
+ca-certificates                     20241121-r1            apk             
+ca-certificates-bundle              20241121-r1            apk             
+carbonphp/carbon-doctrine-types     3.2.0                  php-composer    
 catatonit                           0.2.0-r0               apk             
 clue/stream-filter                  v1.7.0                 php-composer    
-composer                            2.8.3                  binary          
-composer/class-map-generator        1.1.0                  php-composer    
-composer/pcre                       3.1.1                  php-composer    
-coreutils                           9.5-r1                 apk             
-coreutils-env                       9.5-r1                 apk             
-coreutils-fmt                       9.5-r1                 apk             
-coreutils-sha512sum                 9.5-r1                 apk             
-curl                                8.9.1-r2               apk             
-dflydev/dot-access-data             v3.0.2                 php-composer    
-doctrine/cache                      2.2.0                  php-composer    
-doctrine/dbal                       3.8.2                  php-composer    
-doctrine/deprecations               1.1.3                  php-composer    
-doctrine/event-manager              2.0.0                  php-composer    
-doctrine/inflector                  2.0.9                  php-composer    
-doctrine/instantiator               2.0.0                  php-composer    
+composer                            2.8.10                 binary          
+composer/class-map-generator        1.6.1                  php-composer    
+composer/pcre                       3.3.2                  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.12.1-r0              apk             
+dflydev/dot-access-data             v3.0.3                 php-composer    
+doctrine/inflector                  2.0.10                 php-composer    
 doctrine/lexer                      3.0.1                  php-composer    
-dragonmantank/cron-expression       v3.3.3                 php-composer    
-egulias/email-validator             4.0.2                  php-composer    
-fakerphp/faker                      v1.23.1                php-composer    
-filp/whoops                         2.15.4                 php-composer    
+dragonmantank/cron-expression       v3.4.0                 php-composer    
+egulias/email-validator             4.0.4                  php-composer    
+fakerphp/faker                      v1.24.1                php-composer    
+filp/whoops                         2.18.3                 php-composer    
 findutils                           4.9.0-r5               apk             
 fruitcake/php-cors                  v1.3.0                 php-composer    
-git                                 2.45.2-r0              apk             
-git-init-template                   2.45.2-r0              apk             
-graham-campbell/bounded-cache       v2.2.0                 php-composer    
-graham-campbell/github              v12.4.0                php-composer    
-graham-campbell/manager             v5.1.0                 php-composer    
-graham-campbell/result-type         v1.1.2                 php-composer    
-guzzlehttp/guzzle                   7.8.1                  php-composer    
-guzzlehttp/promises                 2.0.2                  php-composer    
-guzzlehttp/psr7                     2.6.2                  php-composer    
-guzzlehttp/uri-template             v1.0.3                 php-composer    
-hamcrest/hamcrest-php               v2.0.1                 php-composer    
-icu-data-en                         74.2-r0                apk             
-icu-libs                            74.2-r0                apk             
+git                                 2.45.4-r0              apk             
+git-init-template                   2.45.4-r0              apk             
+gmp                                 6.3.0-r1               apk             
+graham-campbell/bounded-cache       v3.0.0                 php-composer    
+graham-campbell/github              v12.8.0                php-composer    
+graham-campbell/manager             v5.2.0                 php-composer    
+graham-campbell/result-type         v1.1.3                 php-composer    
+guzzlehttp/guzzle                   7.9.3                  php-composer    
+guzzlehttp/promises                 2.2.0                  php-composer    
+guzzlehttp/psr7                     2.7.1                  php-composer    
+guzzlehttp/uri-template             v1.0.4                 php-composer    
+hamcrest/hamcrest-php               v2.1.1                 php-composer    
+icu-data-en                         74.2-r1                apk             
+icu-libs                            74.2-r1                apk             
 jq                                  1.7.1-r0               apk             
-knplabs/github-api                  v3.13.0                php-composer    
-laravel/framework                   v10.44.0               php-composer    
-laravel/prompts                     v0.1.15                php-composer    
-laravel/serializable-closure        v1.3.3                 php-composer    
-laravel/tinker                      v2.9.0                 php-composer    
-laravel/ui                          v4.4.0                 php-composer    
-laravelcollective/html              v6.4.1                 php-composer    
-lcobucci/jwt                        5.2.0                  php-composer    
-league/commonmark                   2.4.2                  php-composer    
+knplabs/github-api                  v3.16.0                php-composer    
+laravel/framework                   v11.45.1               php-composer    
+laravel/prompts                     v0.3.6                 php-composer    
+laravel/serializable-closure        v2.0.4                 php-composer    
+laravel/tinker                      v2.10.1                php-composer    
+laravel/ui                          v4.6.1                 php-composer    
+lcobucci/jwt                        5.5.0                  php-composer    
+league/commonmark                   2.7.0                  php-composer    
 league/config                       v1.2.0                 php-composer    
-league/flysystem                    3.24.0                 php-composer    
-league/flysystem-aws-s3-v3          3.24.0                 php-composer    
-league/flysystem-local              3.23.1                 php-composer    
-league/mime-type-detection          1.15.0                 php-composer    
+league/flysystem                    3.30.0                 php-composer    
+league/flysystem-aws-s3-v3          3.29.0                 php-composer    
+league/flysystem-local              3.30.0                 php-composer    
+league/mime-type-detection          1.16.0                 php-composer    
+league/uri                          7.5.1                  php-composer    
+league/uri-interfaces               7.5.0                  php-composer    
 libacl                              2.3.2-r0               apk             
 libattr                             2.5.2-r0               apk             
 libbsd                              0.12.2-r0              apk             
 libbz2                              1.0.8-r6               apk             
-libcrypto3                          3.3.2-r1               apk             
-libcurl                             8.9.1-r2               apk             
+libcrypto3                          3.3.4-r0               apk             
+libcurl                             8.12.1-r0              apk             
 libedit                             20240517.3.1-r0        apk             
-libexpat                            2.6.4-r0               apk             
-libgcc                              13.2.1_git20240309-r0  apk             
+libexpat                            2.7.0-r0               apk             
+libgcc                              13.2.1_git20240309-r1  apk             
 libidn2                             2.3.7-r0               apk             
 libintl                             0.22.5-r0              apk             
 libmd                               1.1.0-r0               apk             
-libncursesw                         6.4_p20240420-r1       apk             
-libpq                               16.6-r0                apk             
+libncursesw                         6.4_p20240420-r2       apk             
+libpq                               16.9-r0                apk             
 libproc2                            4.0.4-r0               apk             
 libpsl                              0.21.5-r1              apk             
-libssl3                             3.3.2-r1               apk             
-libstdc++                           13.2.1_git20240309-r0  apk             
+libssl3                             3.3.4-r0               apk             
+libstdc++                           13.2.1_git20240309-r1  apk             
 libunistring                        1.2-r0                 apk             
 libuuid                             2.40.1-r1              apk             
-libxml2                             2.12.7-r0              apk             
+libxml2                             2.12.10-r0             apk             
 libzip                              1.10.1-r0              apk             
 linux-pam                           1.6.0-r0               apk             
 logrotate                           3.21.0-r1              apk             
-mockery/mockery                     1.6.7                  php-composer    
-monolog/monolog                     3.5.0                  php-composer    
-mtdowling/jmespath.php              2.7.0                  php-composer    
-musl                                1.2.5-r0               apk             
-musl-utils                          1.2.5-r0               apk             
-myclabs/deep-copy                   1.11.1                 php-composer    
+mockery/mockery                     1.6.12                 php-composer    
+monolog/monolog                     3.9.0                  php-composer    
+mtdowling/jmespath.php              2.8.0                  php-composer    
+musl                                1.2.5-r1               apk             
+musl-utils                          1.2.5-r1               apk             
+myclabs/deep-copy                   1.13.3                 php-composer    
 nano                                8.0-r0                 apk             
-ncurses-terminfo-base               6.4_p20240420-r1       apk             
-nesbot/carbon                       2.72.3                 php-composer    
+ncurses-terminfo-base               6.4_p20240420-r2       apk             
+nesbot/carbon                       3.10.1                 php-composer    
 netcat-openbsd                      1.226-r0               apk             
-nette/schema                        v1.3.0                 php-composer    
-nette/utils                         v4.0.4                 php-composer    
+nette/schema                        v1.3.2                 php-composer    
+nette/utils                         v4.0.7                 php-composer    
 nghttp2-libs                        1.62.1-r0              apk             
-nginx                               1.26.2-r0              apk             
-nikic/php-parser                    v5.0.0                 php-composer    
-nunomaduro/collision                v6.4.0                 php-composer    
-nunomaduro/termwind                 v1.15.1                php-composer    
+nginx                               1.26.3-r0              apk             
+nikic/php-parser                    v5.5.0                 php-composer    
+nunomaduro/collision                v8.5.0                 php-composer    
+nunomaduro/termwind                 v2.3.1                 php-composer    
 oniguruma                           6.9.9-r0               apk             
-openssl                             3.3.2-r1               apk             
+openssl                             3.3.4-r0               apk             
 pcre                                8.45-r3                apk             
 pcre2                               10.43-r0               apk             
-phar-io/manifest                    2.0.3                  php-composer    
+phar-io/manifest                    2.0.4                  php-composer    
 phar-io/version                     3.2.1                  php-composer    
-php-http/cache-plugin               1.8.1                  php-composer    
-php-http/client-common              2.7.1                  php-composer    
-php-http/discovery                  1.19.2                 php-composer    
-php-http/httplug                    2.4.0                  php-composer    
-php-http/message                    1.16.0                 php-composer    
-php-http/message-factory            1.1.0                  php-composer    
-php-http/multipart-stream-builder   1.3.0                  php-composer    
-php-http/promise                    1.3.0                  php-composer    
-php83                               8.3.14-r0              apk             
-php83-common                        8.3.14-r0              apk             
-php83-ctype                         8.3.14-r0              apk             
-php83-curl                          8.3.14-r0              apk             
-php83-dom                           8.3.14-r0              apk             
-php83-fileinfo                      8.3.14-r0              apk             
-php83-fpm                           8.3.14-r0              apk             
-php83-iconv                         8.3.14-r0              apk             
-php83-intl                          8.3.14-r0              apk             
-php83-mbstring                      8.3.14-r0              apk             
-php83-mysqlnd                       8.3.14-r0              apk             
-php83-opcache                       8.3.14-r0              apk             
-php83-openssl                       8.3.14-r0              apk             
-php83-pdo                           8.3.14-r0              apk             
-php83-pdo_mysql                     8.3.14-r0              apk             
-php83-pdo_pgsql                     8.3.14-r0              apk             
-php83-pdo_sqlite                    8.3.14-r0              apk             
-php83-phar                          8.3.14-r0              apk             
-php83-session                       8.3.14-r0              apk             
-php83-simplexml                     8.3.14-r0              apk             
-php83-tokenizer                     8.3.14-r0              apk             
-php83-xml                           8.3.14-r0              apk             
-php83-xmlwriter                     8.3.14-r0              apk             
-php83-zip                           8.3.14-r0              apk             
-phpdocumentor/reflection-common     2.2.0                  php-composer    
-phpdocumentor/type-resolver         1.8.0                  php-composer    
-phpoption/phpoption                 1.9.2                  php-composer    
-phpstan/phpdoc-parser               1.25.0                 php-composer    
-phpunit/php-code-coverage           9.2.30                 php-composer    
-phpunit/php-file-iterator           3.0.6                  php-composer    
-phpunit/php-invoker                 3.1.1                  php-composer    
-phpunit/php-text-template           2.0.4                  php-composer    
-phpunit/php-timer                   5.0.3                  php-composer    
-phpunit/phpunit                     9.6.16                 php-composer    
+php-http/cache-plugin               2.0.1                  php-composer    
+php-http/client-common              2.7.2                  php-composer    
+php-http/discovery                  1.20.0                 php-composer    
+php-http/httplug                    2.4.1                  php-composer    
+php-http/message                    1.16.2                 php-composer    
+php-http/multipart-stream-builder   1.4.2                  php-composer    
+php-http/promise                    1.3.1                  php-composer    
+php83                               8.3.15-r0              apk             
+php83-common                        8.3.15-r0              apk             
+php83-ctype                         8.3.15-r0              apk             
+php83-curl                          8.3.15-r0              apk             
+php83-dom                           8.3.15-r0              apk             
+php83-fileinfo                      8.3.15-r0              apk             
+php83-fpm                           8.3.15-r0              apk             
+php83-iconv                         8.3.15-r0              apk             
+php83-intl                          8.3.15-r0              apk             
+php83-mbstring                      8.3.15-r0              apk             
+php83-mysqlnd                       8.3.15-r0              apk             
+php83-opcache                       8.3.15-r0              apk             
+php83-openssl                       8.3.15-r0              apk             
+php83-pdo                           8.3.15-r0              apk             
+php83-pdo_mysql                     8.3.15-r0              apk             
+php83-pdo_pgsql                     8.3.15-r0              apk             
+php83-pdo_sqlite                    8.3.15-r0              apk             
+php83-phar                          8.3.15-r0              apk             
+php83-session                       8.3.15-r0              apk             
+php83-simplexml                     8.3.15-r0              apk             
+php83-tokenizer                     8.3.15-r0              apk             
+php83-xml                           8.3.15-r0              apk             
+php83-xmlwriter                     8.3.15-r0              apk             
+php83-zip                           8.3.15-r0              apk             
+phpoption/phpoption                 1.9.3                  php-composer    
+phpunit/php-code-coverage           10.1.16                php-composer    
+phpunit/php-file-iterator           4.1.0                  php-composer    
+phpunit/php-invoker                 4.0.0                  php-composer    
+phpunit/php-text-template           3.0.1                  php-composer    
+phpunit/php-timer                   6.0.0                  php-composer    
+phpunit/phpunit                     10.5.47                php-composer    
 popt                                1.19-r3                apk             
 procps-ng                           4.0.4-r0               apk             
 psr/cache                           3.0.0                  php-composer    
@@ -170,82 +163,83 @@ psr/clock                           1.0.0                  php-composer
 psr/container                       2.0.2                  php-composer    
 psr/event-dispatcher                1.0.0                  php-composer    
 psr/http-client                     1.0.3                  php-composer    
-psr/http-factory                    1.0.2                  php-composer    
+psr/http-factory                    1.1.0                  php-composer    
 psr/http-message                    2.0                    php-composer    
-psr/log                             3.0.0                  php-composer    
+psr/log                             3.0.2                  php-composer    
 psr/simple-cache                    3.0.0                  php-composer    
-psy/psysh                           v0.12.0                php-composer    
+psy/psysh                           v0.12.9                php-composer    
 ralouphie/getallheaders             3.0.3                  php-composer    
-ramsey/collection                   2.0.0                  php-composer    
-ramsey/uuid                         4.7.5                  php-composer    
+ramsey/collection                   2.1.1                  php-composer    
+ramsey/uuid                         4.9.0                  php-composer    
 readline                            8.2.10-r0              apk             
 scanelf                             1.3.7-r2               apk             
-sebastian/cli-parser                1.0.1                  php-composer    
-sebastian/code-unit                 1.0.8                  php-composer    
-sebastian/code-unit-reverse-lookup  2.0.3                  php-composer    
-sebastian/comparator                4.0.8                  php-composer    
-sebastian/complexity                2.0.3                  php-composer    
-sebastian/diff                      4.0.5                  php-composer    
-sebastian/environment               5.1.5                  php-composer    
-sebastian/exporter                  4.0.5                  php-composer    
-sebastian/global-state              5.0.6                  php-composer    
-sebastian/lines-of-code             1.0.4                  php-composer    
-sebastian/object-enumerator         4.0.4                  php-composer    
-sebastian/object-reflector          2.0.4                  php-composer    
-sebastian/recursion-context         4.0.5                  php-composer    
-sebastian/resource-operations       3.0.3                  php-composer    
-sebastian/type                      3.2.1                  php-composer    
-sebastian/version                   3.0.2                  php-composer    
+sebastian/cli-parser                2.0.1                  php-composer    
+sebastian/code-unit                 2.0.0                  php-composer    
+sebastian/code-unit-reverse-lookup  3.0.0                  php-composer    
+sebastian/comparator                5.0.3                  php-composer    
+sebastian/complexity                3.2.0                  php-composer    
+sebastian/diff                      5.1.1                  php-composer    
+sebastian/environment               6.1.0                  php-composer    
+sebastian/exporter                  5.1.2                  php-composer    
+sebastian/global-state              6.0.2                  php-composer    
+sebastian/lines-of-code             2.0.2                  php-composer    
+sebastian/object-enumerator         5.0.0                  php-composer    
+sebastian/object-reflector          3.0.0                  php-composer    
+sebastian/recursion-context         5.0.0                  php-composer    
+sebastian/type                      4.0.0                  php-composer    
+sebastian/version                   4.0.1                  php-composer    
 shadow                              4.15.1-r0              apk             
 skalibs                             2.14.1.1-r0            apk             
-spatie/backtrace                    1.5.3                  php-composer    
-spatie/flare-client-php             1.4.4                  php-composer    
-spatie/ignition                     1.12.0                 php-composer    
-spatie/laravel-ignition             2.4.2                  php-composer    
-sqlite-libs                         3.45.3-r1              apk             
-squizlabs/php_codesniffer           3.9.0                  php-composer    
+spatie/backtrace                    1.7.4                  php-composer    
+spatie/error-solutions              1.1.3                  php-composer    
+spatie/flare-client-php             1.10.1                 php-composer    
+spatie/ignition                     1.15.1                 php-composer    
+spatie/laravel-html                 3.12.0                 php-composer    
+spatie/laravel-ignition             2.9.1                  php-composer    
+sqlite-libs                         3.45.3-r2              apk             
+squizlabs/php_codesniffer           3.13.2                 php-composer    
 ssl_client                          1.36.1-r29             apk             
-symfony/cache                       v6.4.3                 php-composer    
-symfony/cache-contracts             v3.4.0                 php-composer    
-symfony/console                     v6.4.3                 php-composer    
-symfony/css-selector                v7.0.3                 php-composer    
-symfony/deprecation-contracts       v3.4.0                 php-composer    
-symfony/error-handler               v6.4.3                 php-composer    
-symfony/event-dispatcher            v7.0.3                 php-composer    
-symfony/event-dispatcher-contracts  v3.4.0                 php-composer    
-symfony/finder                      v6.4.0                 php-composer    
-symfony/http-foundation             v6.4.3                 php-composer    
-symfony/http-kernel                 v6.4.3                 php-composer    
-symfony/mailer                      v6.4.3                 php-composer    
-symfony/mime                        v6.4.3                 php-composer    
-symfony/options-resolver            v7.0.0                 php-composer    
-symfony/polyfill-ctype              v1.29.0                php-composer    
-symfony/polyfill-intl-grapheme      v1.29.0                php-composer    
-symfony/polyfill-intl-idn           v1.29.0                php-composer    
-symfony/polyfill-intl-normalizer    v1.29.0                php-composer    
-symfony/polyfill-mbstring           v1.29.0                php-composer    
-symfony/polyfill-php72              v1.29.0                php-composer    
-symfony/polyfill-php80              v1.29.0                php-composer    
-symfony/polyfill-php83              v1.29.0                php-composer    
-symfony/polyfill-uuid               v1.29.0                php-composer    
-symfony/process                     v6.4.3                 php-composer    
-symfony/routing                     v6.4.3                 php-composer    
-symfony/service-contracts           v3.4.1                 php-composer    
-symfony/string                      v7.0.3                 php-composer    
-symfony/thanks                      v1.2.10                php-composer    
-symfony/translation                 v6.4.3                 php-composer    
-symfony/translation-contracts       v3.4.1                 php-composer    
-symfony/uid                         v6.4.3                 php-composer    
-symfony/var-dumper                  v6.4.3                 php-composer    
-symfony/var-exporter                v7.0.3                 php-composer    
-symfony/yaml                        v6.4.3                 php-composer    
-theseer/tokenizer                   1.2.2                  php-composer    
-tijsverkoyen/css-to-inline-styles   v2.2.7                 php-composer    
-tzdata                              2024b-r0               apk             
+symfony/cache                       v7.3.1                 php-composer    
+symfony/cache-contracts             v3.6.0                 php-composer    
+symfony/clock                       v7.3.0                 php-composer    
+symfony/console                     v7.3.1                 php-composer    
+symfony/css-selector                v7.3.0                 php-composer    
+symfony/deprecation-contracts       v3.6.0                 php-composer    
+symfony/error-handler               v7.3.1                 php-composer    
+symfony/event-dispatcher            v7.3.0                 php-composer    
+symfony/event-dispatcher-contracts  v3.6.0                 php-composer    
+symfony/finder                      v7.3.0                 php-composer    
+symfony/http-foundation             v7.3.1                 php-composer    
+symfony/http-kernel                 v7.3.1                 php-composer    
+symfony/mailer                      v7.3.1                 php-composer    
+symfony/mime                        v7.3.0                 php-composer    
+symfony/options-resolver            v7.3.0                 php-composer    
+symfony/polyfill-ctype              v1.32.0                php-composer    
+symfony/polyfill-intl-grapheme      v1.32.0                php-composer    
+symfony/polyfill-intl-idn           v1.32.0                php-composer    
+symfony/polyfill-intl-normalizer    v1.32.0                php-composer    
+symfony/polyfill-mbstring           v1.32.0                php-composer    
+symfony/polyfill-php80              v1.32.0                php-composer    
+symfony/polyfill-php83              v1.32.0                php-composer    
+symfony/polyfill-uuid               v1.32.0                php-composer    
+symfony/process                     v7.3.0                 php-composer    
+symfony/routing                     v7.3.0                 php-composer    
+symfony/service-contracts           v3.6.0                 php-composer    
+symfony/string                      v7.3.0                 php-composer    
+symfony/thanks                      v1.4.0                 php-composer    
+symfony/translation                 v7.3.1                 php-composer    
+symfony/translation-contracts       v3.6.0                 php-composer    
+symfony/uid                         v7.3.1                 php-composer    
+symfony/var-dumper                  v7.3.1                 php-composer    
+symfony/var-exporter                v7.3.0                 php-composer    
+symfony/yaml                        v7.3.1                 php-composer    
+theseer/tokenizer                   1.2.3                  php-composer    
+tijsverkoyen/css-to-inline-styles   v2.3.0                 php-composer    
+tzdata                              2025b-r0               apk             
 utmps-libs                          0.1.2.2-r1             apk             
-vlucas/phpdotenv                    v5.6.0                 php-composer    
-voku/portable-ascii                 2.0.1                  php-composer    
+vlucas/phpdotenv                    v5.6.2                 php-composer    
+voku/portable-ascii                 2.0.3                  php-composer    
 webmozart/assert                    1.11.0                 php-composer    
-xz-libs                             5.6.2-r0               apk             
+xz-libs                             5.6.2-r1               apk             
 zlib                                1.3.1-r1               apk             
 zstd-libs                           1.5.6-r0               apk             

readme-vars.yml

@@ -59,6 +59,7 @@ init_diagram: |
     init-heimdall-config -> init-config-end
     init-os-end -> init-crontab-config
     init-mods-end -> init-custom-files
+    init-adduser -> init-device-perms
     base -> init-envfile
     init-os-end -> init-folders
     init-nginx-end -> init-heimdall-config
@@ -74,6 +75,7 @@ init_diagram: |
     init-permissions -> init-nginx-end
     base -> init-os-end
     init-adduser -> init-os-end
+    init-device-perms -> init-os-end
     init-envfile -> init-os-end
     init-migrations -> init-os-end
     init-keygen -> init-permissions