Bot Updating Package Versions

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

.github/CONTRIBUTING.md

@@ -24,7 +24,7 @@
 ## Readme
 
 If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
-Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-heimdall/edit/master/readme-vars.yml).
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-heimdall/edit/development/readme-vars.yml).
 
 These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
 Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-heimdall)
@@ -115,7 +115,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Update the changelog
 
-If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-heimdall/tree/master/root), add an entry to the changelog
+If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-heimdall/tree/development/root), add an entry to the changelog
 
 ```yml
 changelogs:

.github/PULL_REQUEST_TEMPLATE.md

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

.github/workflows/external_trigger.yml

@@ -7,31 +7,31 @@ permissions:
   contents: read
 
 jobs:
-  external-trigger-master:
+  external-trigger-development:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4.1.1
 
       - name: External Trigger
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/development'
         env:
           SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }}
         run: |
           printf "# External trigger for docker-heimdall\n\n" >> $GITHUB_STEP_SUMMARY
-          if grep -q "^heimdall_master_" <<< "${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_master_\`; will skip trigger if version matches." >> $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_master" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+          elif grep -q "^heimdall_development" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
-            echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` contains \`heimdall_master\`; skipping trigger." >> $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, add \`heimdall_master\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
+          echo "> External trigger running off of development branch. To disable this trigger, add \`heimdall_development\` into the Github organizational variable \`SKIP_EXTERNAL_TRIGGER\`." >> $GITHUB_STEP_SUMMARY
           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_stable\`" >> $GITHUB_STEP_SUMMARY
+          echo "Type is \`github_commit\`" >> $GITHUB_STEP_SUMMARY
-          if grep -q "^heimdall_master_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then
+          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
@@ -39,7 +39,7 @@ jobs:
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
             echo "> Can't retrieve external version, exiting" >> $GITHUB_STEP_SUMMARY
-            FAILURE_REASON="Can't retrieve external version for heimdall branch master"
+            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"}],
@@ -50,7 +50,7 @@ jobs:
           echo "Sanitized external version: \`${EXT_RELEASE_SANITIZED}\`" >> $GITHUB_STEP_SUMMARY
           echo "Retrieving last pushed version" >> $GITHUB_STEP_SUMMARY
           image="linuxserver/heimdall"
-          tag="latest"
+          tag="development"
           token=$(curl -sX GET \
             "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fheimdall%3Apull" \
             | jq -r '.token')
@@ -96,7 +96,7 @@ jobs:
           if [ -z "${IMAGE_VERSION}" ]; then
             echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
             echo "Can't retrieve last pushed version, exiting" >> $GITHUB_STEP_SUMMARY
-            FAILURE_REASON="Can't retrieve last pushed version for heimdall tag latest"
+            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 }}
@@ -106,14 +106,14 @@ jobs:
           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/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/lastBuild/api/json | jq -r '.building') == "true" ]; then
             echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
           else
             if [[ "${artifacts_found}" == "false" ]]; then
               echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY
               echo "> New version detected, but not all artifacts are published yet; skipping trigger" >> $GITHUB_STEP_SUMMARY
-              FAILURE_REASON="New version ${EXT_RELEASE} for heimdall tag latest is detected, however not all artifacts are uploaded to upstream release yet. Will try again later."
+              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."
               curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
                 "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
                 "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -124,7 +124,7 @@ jobs:
                 echo "All artifacts seem to be uploaded." >> $GITHUB_STEP_SUMMARY
               fi
               response=$(curl -iX POST \
-                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/buildWithParameters?PACKAGE_CHECK=false \
+                https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/buildWithParameters?PACKAGE_CHECK=false \
                 --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
               echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY
               echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY
@@ -139,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 latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE_SANITIZED}"
+              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/greetings.yml

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

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.22
 
 # set version label
 ARG BUILD_DATE
@@ -12,13 +12,13 @@ LABEL maintainer="aptalca"
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    php83-dom \
+    php84-dom \
-    php83-intl \
+    php84-intl \
-    php83-pdo_pgsql \
+    php84-opcache \
-    php83-pdo_sqlite \
+    php84-pdo_mysql \
-    php83-pdo_mysql \
+    php84-pdo_pgsql \
-    php83-opcache \
+    php84-pdo_sqlite \
-    php83-tokenizer && \
+    php84-tokenizer && \
   echo "**** configure nginx ****" && \
   echo 'fastcgi_param  PHP_AUTH_USER      $remote_user; # Heimdall user authorization' >> \
     /etc/nginx/fastcgi_params && \
@@ -26,13 +26,17 @@ RUN \
     /etc/nginx/fastcgi_params && \
   echo "**** configure php opcache ****" && \
   echo 'opcache.validate_timestamps=0' >> \
-    /etc/php83/conf.d/00_opcache.ini && \
+    /etc/php84/conf.d/00_opcache.ini && \
+  echo "**** configure php-fpm to pass env vars ****" && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
+  if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
   echo "**** install heimdall ****" && \
   mkdir -p \
     /heimdall && \
   if [ -z ${HEIMDALL_RELEASE+x} ]; then \
-    HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
+    HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/2.x" \
-    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+    | awk '/sha/{print $4;exit}' FS='[""]'); \
   fi && \
   curl -o \
     /tmp/heimdall.tar.gz -L \

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.22
 
 # set version label
 ARG BUILD_DATE
@@ -12,13 +12,13 @@ LABEL maintainer="aptalca"
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache \
-    php83-dom \
+    php84-dom \
-    php83-intl \
+    php84-intl \
-    php83-pdo_pgsql \
+    php84-opcache \
-    php83-pdo_sqlite \
+    php84-pdo_mysql \
-    php83-pdo_mysql \
+    php84-pdo_pgsql \
-    php83-opcache \
+    php84-pdo_sqlite \
-    php83-tokenizer && \
+    php84-tokenizer && \
   echo "**** configure nginx ****" && \
   echo 'fastcgi_param  PHP_AUTH_USER      $remote_user; # Heimdall user authorization' >> \
     /etc/nginx/fastcgi_params && \
@@ -26,13 +26,17 @@ RUN \
     /etc/nginx/fastcgi_params && \
   echo "**** configure php opcache ****" && \
   echo 'opcache.validate_timestamps=0' >> \
-    /etc/php83/conf.d/00_opcache.ini && \
+    /etc/php84/conf.d/00_opcache.ini && \
+  echo "**** configure php-fpm to pass env vars ****" && \
+  sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php84/php-fpm.d/www.conf && \
+  if ! grep -qxF 'clear_env = no' /etc/php84/php-fpm.d/www.conf; then echo 'clear_env = no' >> /etc/php84/php-fpm.d/www.conf; fi && \
+  echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php84/php-fpm.conf && \
   echo "**** install heimdall ****" && \
   mkdir -p \
     /heimdall && \
   if [ -z ${HEIMDALL_RELEASE+x} ]; then \
-    HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/releases/latest" \
+    HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/2.x" \
-    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
+    | awk '/sha/{print $4;exit}' FS='[""]'); \
   fi && \
   curl -o \
     /tmp/heimdall.tar.gz -L \

Jenkinsfile

@@ -79,7 +79,7 @@ pipeline {
         script{
           env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
-            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:development 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
             returnStdout: true).trim()
           env.LS_RELEASE_NOTES = sh(
             script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -112,7 +112,7 @@ pipeline {
         script{
           env.LS_TAG_NUMBER = sh(
             script: '''#! /bin/bash
-                       tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
+                       tagsha=$(git rev-list -n 1 development-${LS_RELEASE} 2>/dev/null)
                        if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
                          echo ${LS_RELEASE_NUMBER}
                        elif [ -z "${GIT_COMMIT}" ]; then
@@ -145,21 +145,21 @@ pipeline {
     /* ########################
        External Release Tagging
        ######################## */
-    // If this is a stable github release use the latest endpoint from github to determine the ext tag
+    // If this is a github commit trigger determine the current commit at head
-    stage("Set ENV github_stable"){
+    stage("Set ENV github_commit"){
      steps{
        script{
          env.EXT_RELEASE = sh(
-           script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq -r '. | .tag_name' ''',
+           script: '''curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq -r '. | .sha' | cut -c1-8 ''',
            returnStdout: true).trim()
        }
      }
     }
-    // If this is a stable or devel github release generate the link for the build message
+    // If this is a github commit trigger Set the external release link
-    stage("Set ENV github_link"){
+    stage("Set ENV commit_link"){
      steps{
        script{
-         env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/releases/tag/' + env.EXT_RELEASE
+         env.RELEASE_LINK = 'https://github.com/' + env.EXT_USER + '/' + env.EXT_REPO + '/commit/' + env.EXT_RELEASE
        }
      }
     }
@@ -197,10 +197,10 @@ pipeline {
         }
       }
     }
-    // If this is a master build use live docker endpoints
+    // If this is a development build use live docker endpoints
     stage("Set ENV live build"){
       when {
-        branch "master"
+        branch "development"
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
@@ -210,21 +210,22 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           }
           env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.META_TAG = 'development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.EXT_RELEASE_TAG = 'development-version-' + env.EXT_RELEASE_CLEAN
           env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
+          env.CITEST_IMAGETAG = 'latest'
         }
       }
     }
     // If this is a dev build use dev docker endpoints
     stage("Set ENV dev build"){
       when {
-        not {branch "master"}
+        not {branch "development"}
         environment name: 'CHANGE_ID', value: ''
       }
       steps {
@@ -234,15 +235,16 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           }
           env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.META_TAG = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.EXT_RELEASE_TAG = 'development-version-' + env.EXT_RELEASE_CLEAN
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
           env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
+          env.CITEST_IMAGETAG = 'develop'
         }
       }
     }
@@ -258,16 +260,17 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'amd64-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           }
           env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+          env.META_TAG = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
-          env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
+          env.EXT_RELEASE_TAG = 'development-version-' + env.EXT_RELEASE_CLEAN
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
           env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache'
+          env.CITEST_IMAGETAG = 'develop'
         }
       }
     }
@@ -290,7 +293,7 @@ pipeline {
                   -v ${WORKSPACE}:/mnt \
                   -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
                   -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
+                  ghcr.io/linuxserver/baseimage-alpine:3.23 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
                     apk add --no-cache python3 && \
                     python3 -m venv /lsiopy && \
                     pip install --no-cache-dir -U pip && \
@@ -302,7 +305,7 @@ pipeline {
     // Use helper containers to render templated files
     stage('Update-Templates') {
       when {
-        branch "master"
+        branch "development"
         environment name: 'CHANGE_ID', value: ''
         expression {
           env.CONTAINER_NAME != null
@@ -314,24 +317,24 @@ pipeline {
               TEMPDIR=$(mktemp -d)
               docker pull ghcr.io/linuxserver/jenkins-builder:latest
               # Cloned repo paths for templating:
-              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch master of ${LS_USER}/${LS_REPO} for running the jenkins builder on
+              # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch development of ${LS_USER}/${LS_REPO} for running the jenkins builder on
-              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch master of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
+              # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch development of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github
               # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github
               # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos
               # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github
-              git clone --branch master --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
+              git clone --branch development --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
               docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest 
               echo "Starting Stage 1 - Jenkinsfile update"
               if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                 cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f development
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                 git add Jenkinsfile
                 git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                 echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
@@ -350,13 +353,13 @@ pipeline {
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                 cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f development
                 for i in ${TEMPLATES_TO_DELETE}; do
                   git rm "${i}"
                 done
                 git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                 echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
@@ -371,20 +374,20 @@ pipeline {
                 sed -i 's|^changelogs:|# init diagram\\ninit_diagram:\\n\\n# changelog\\nchangelogs:|' readme-vars.yml
               fi
               mkdir -p ${TEMPDIR}/d2
-              docker run --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) -e RAW="true" ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:latest
+              docker run --rm -v ${TEMPDIR}/d2:/output -e PUID=$(id -u) -e PGID=$(id -g) -e RAW="true" ghcr.io/linuxserver/d2-builder:latest ${CONTAINER_NAME}:development
               ls -al ${TEMPDIR}/d2
-              yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-latest.d2\\")" readme-vars.yml
+              yq -ei ".init_diagram |= load_str(\\"${TEMPDIR}/d2/${CONTAINER_NAME}-development.d2\\")" readme-vars.yml
               if [[ $(md5sum readme-vars.yml | cut -c1-8) != $(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/readme-vars.yml | cut -c1-8) ]]; then
                 echo "'init_diagram' has been updated. Updating repo and exiting build, new one will trigger based on commit."
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                 cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f development
                 cp ${WORKSPACE}/readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/readme-vars.yml
                 git add readme-vars.yml
                 git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                 echo "Updating templates and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
@@ -401,7 +404,7 @@ pipeline {
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                 cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f development
                 cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
@@ -414,8 +417,8 @@ pipeline {
                 fi
                 git add readme-vars.yml ${TEMPLATED_FILES}
                 git commit -m 'Bot Updating Templated Files'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                 echo "Updating templates and exiting build, new one will trigger based on commit"
                 rm -Rf ${TEMPDIR}
@@ -516,7 +519,7 @@ pipeline {
     // Exit the build if the Templated files were just updated
     stage('Template-exit') {
       when {
-        branch "master"
+        branch "development"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'FILES_UPDATED', value: 'true'
         expression {
@@ -529,10 +532,10 @@ pipeline {
         }
       }
     }
-    // If this is a master build check the S6 service file perms
+    // If this is a development build check the S6 service file perms
     stage("Check S6 Service file Permissions"){
       when {
-        branch "master"
+        branch "development"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -625,13 +628,16 @@ pipeline {
                     echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                     echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                     echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+
                     if [[ "${PACKAGE_CHECK}" != "true" ]]; then
+                      declare -A pids
                       IFS=',' read -ra CACHE <<< "$BUILDCACHE"
                       for i in "${CACHE[@]}"; do
                         docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
+                        pids[$!]="$i"
                       done
-                      for p in $(jobs -p); do
+                      for p in "${!pids[@]}"; do
-                        wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                        wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
                       done
                     fi
                 '''
@@ -691,13 +697,16 @@ pipeline {
                         echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                         echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                         echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
+
                         if [[ "${PACKAGE_CHECK}" != "true" ]]; then
+                          declare -A pids
                           IFS=',' read -ra CACHE <<< "$BUILDCACHE"
                           for i in "${CACHE[@]}"; do
                             docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} &
+                            pids[$!]="$i"
                           done
-                          for p in $(jobs -p); do
+                          for p in "${!pids[@]}"; do
-                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                            wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
                           done
                         fi
                     '''
@@ -751,12 +760,14 @@ pipeline {
                         echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                         echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                         if [[ "${PACKAGE_CHECK}" != "true" ]]; then
+                          declare -A pids
                           IFS=',' read -ra CACHE <<< "$BUILDCACHE"
                           for i in "${CACHE[@]}"; do
                             docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} &
+                            pids[$!]="$i"
                           done
-                          for p in $(jobs -p); do
+                          for p in "${!pids[@]}"; do
-                            wait "$p" || { echo "job $p failed" >&2; exit 1; }
+                            wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && exit 1; }
                           done
                         fi
                     '''
@@ -777,7 +788,7 @@ pipeline {
     // Take the image we just built and dump package versions for comparison
     stage('Update-packages') {
       when {
-        branch "master"
+        branch "development"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
@@ -800,14 +811,14 @@ pipeline {
               echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
               if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f development
                 cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                 cd ${TEMPDIR}/${LS_REPO}/
                 wait
                 git add package_versions.txt
                 git commit -m 'Bot Updating Package Versions'
-                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git master
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
                 echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
                 echo "Package tag updated, stopping build process"
               else
@@ -825,7 +836,7 @@ pipeline {
     // Exit the build if the package file was just updated
     stage('PACKAGE-exit') {
       when {
-        branch "master"
+        branch "development"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
@@ -839,7 +850,7 @@ pipeline {
     // Exit the build if this is just a package check and there are no changes to push
     stage('PACKAGECHECK-exit') {
       when {
-        branch "master"
+        branch "development"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'PACKAGE_UPDATED', value: 'false'
         environment name: 'EXIT_STATUS', value: ''
@@ -881,7 +892,7 @@ pipeline {
                     CI_DOCKERENV="LSIO_FIRST_PARTY=true"
                   fi
                 fi
-                docker pull ghcr.io/linuxserver/ci:latest
+                docker pull ghcr.io/linuxserver/ci:${CITEST_IMAGETAG}
                 if [ "${MULTIARCH}" == "true" ]; then
                   docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
                   docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
@@ -893,7 +904,7 @@ pipeline {
                 -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                 -e TAGS=\"${CI_TAGS}\" \
                 -e META_TAG=\"${META_TAG}\" \
-                -e RELEASE_TAG=\"latest\" \
+                -e RELEASE_TAG=\"development\" \
                 -e PORT=\"${CI_PORT}\" \
                 -e SSL=\"${CI_SSL}\" \
                 -e BASE=\"${DIST_IMAGE}\" \
@@ -905,7 +916,9 @@ pipeline {
                 -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 \
+                -e COMMIT_SHA=\"${COMMIT_SHA}\" \
+                -e BUILD_NUMBER=\"${BUILD_NUMBER}\" \
+                -t ghcr.io/linuxserver/ci:${CITEST_IMAGETAG} \
                 python3 test_build.py'''
         }
       }
@@ -931,9 +944,11 @@ pipeline {
                           CACHEIMAGE=${i}
                       fi
                   done
-                  docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:latest -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:development -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
+                    { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
                   if [ -n "${SEMVER}" ]; then
-                    docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
+                      { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
                   fi
                 done
               '''
@@ -958,20 +973,27 @@ pipeline {
                           CACHEIMAGE=${i}
                       fi
                   done
-                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-latest -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-development -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
-                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-latest -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
+                  docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-development -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
+                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
                   if [ -n "${SEMVER}" ]; then
-                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
-                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                      { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
+                    docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
+                      { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
                   fi
                 done
                 for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
-                  docker buildx imagetools create -t ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm64v8-development || \
-                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
-
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
-                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
+                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
+                  docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \
+                    { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
                   if [ -n "${SEMVER}" ]; then
-                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
+                    docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \
+                      { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
                   fi
                 done
               '''
@@ -981,7 +1003,7 @@ pipeline {
     // If this is a public release tag it in the LS Github
     stage('Github-Tag-Push-Release') {
       when {
-        branch "master"
+        branch "development"
         expression {
           env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
         }
@@ -989,36 +1011,54 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        echo "Pushing New tag for current commit ${META_TAG}"
-        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
-        -d '{"tag":"'${META_TAG}'",\
-             "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
-             "type": "commit",\
-             "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
-        echo "Pushing New release for Tag"
         sh '''#! /bin/bash
-              curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/releases/latest | jq '. |.body' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
+              echo "Auto-generating release notes"
-              echo '{"tag_name":"'${META_TAG}'",\
+              if [ "$(git tag --points-at HEAD)" != "" ]; then
-                     "target_commitish": "master",\
+                echo "Existing tag points to current commit, suggesting no new LS changes"
-                     "name": "'${META_TAG}'",\
+                AUTO_RELEASE_NOTES="No changes"
-                     "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
+              else
-              printf '","draft": false,"prerelease": false}' >> releasebody.json
+                AUTO_RELEASE_NOTES=$(curl -fsL -H "Authorization: token ${GITHUB_TOKEN}" -H "Accept: application/vnd.github+json" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/generate-notes  \
-              paste -d'\\0' start releasebody.json > releasebody.json.done
+                  -d '{"tag_name":"'${META_TAG}'",\
-              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
+                      "target_commitish": "development"}' \
+                  | jq -r '.body' | sed 's|## What.s Changed||')
+              fi
+              echo "Pushing New tag for current commit ${META_TAG}"
+              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
+                -d '{"tag":"'${META_TAG}'",\
+                  "object": "'${COMMIT_SHA}'",\
+                  "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to development",\
+                  "type": "commit",\
+                  "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}'
+              echo "Pushing New release for Tag"
+              curl -H "Authorization: token ${GITHUB_TOKEN}" -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_RELEASE_CLEAN} | jq -r '.commit.message' > releasebody.json
+              jq -n \
+                --arg tag_name "$META_TAG" \
+                --arg target_commitish "development" \
+                --arg ci_url "${CI_URL:-N/A}" \
+                --arg ls_notes "$AUTO_RELEASE_NOTES" \
+                --arg remote_notes "$(cat releasebody.json)" \
+                '{
+                  "tag_name": $tag_name,
+                  "target_commitish": $target_commitish,
+                  "name": $tag_name,
+                  "body": ("**CI Report:**\\n\\n" + $ci_url + "\\n\\n**LinuxServer Changes:**\\n\\n" + $ls_notes + "\\n\\n**Remote Changes:**\\n\\n" + $remote_notes),
+                  "draft": false,
+                  "prerelease": true                }' > 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
+        '''
       }
     }
     // Add protection to the release branch
     stage('Github-Release-Branch-Protection') {
       when {
-        branch "master"
+        branch "development"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        echo "Setting up protection for release branch master"
+        echo "Setting up protection for release branch development"
         sh '''#! /bin/bash
-          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/master/protection \
+          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/development/protection \
           -d $(jq -c .  << EOF
             {
               "required_status_checks": null,

README.md

@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT THIS FILE MANUALLY -->
-<!-- Please read https://github.com/linuxserver/docker-heimdall/blob/master/.github/CONTRIBUTING.md -->
+<!-- Please read https://github.com/linuxserver/docker-heimdall/blob/development/.github/CONTRIBUTING.md -->
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 
 [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
@@ -34,8 +34,8 @@ Find us at:
 [![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/heimdall)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/heimdall.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/heimdall)
-[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-heimdall%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/master/)
+[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-heimdall%2Fjob%2Fdevelopment%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/)
-[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fheimdall%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/heimdall/latest/index.html)
+[![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fheimdall%2Fdevelopment%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/heimdall/development/index.html)
 
 [Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way.
 
@@ -49,7 +49,7 @@ Why not use it as your browser start page? It even has the ability to include a
 
 We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://distribution.github.io/distribution/spec/manifest-v2-2/#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
 
-Simply pulling `lscr.io/linuxserver/heimdall:latest` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/heimdall:development` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
 
 The architectures supported by this image are:
 
@@ -80,7 +80,7 @@ This image now supports password protection through htpasswd. Run the following
 To help you get started creating a container from this image you can either use docker-compose or the docker cli.
 
 >[!NOTE]
->Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided.
+>Unless a parameter is flagged 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))
 
@@ -88,12 +88,13 @@ To help you get started creating a container from this image you can either use
 ---
 services:
   heimdall:
-    image: lscr.io/linuxserver/heimdall:latest
+    image: lscr.io/linuxserver/heimdall:development
     container_name: heimdall
     environment:
       - PUID=1000
       - PGID=1000
       - TZ=Etc/UTC
+      - ALLOW_INTERNAL_REQUESTS=false #optional
     volumes:
       - /path/to/heimdall/config:/config
     ports:
@@ -110,11 +111,12 @@ docker run -d \
   -e PUID=1000 \
   -e PGID=1000 \
   -e TZ=Etc/UTC \
+  -e ALLOW_INTERNAL_REQUESTS=false `#optional` \
   -p 80:80 \
   -p 443:443 \
   -v /path/to/heimdall/config:/config \
   --restart unless-stopped \
-  lscr.io/linuxserver/heimdall:latest
+  lscr.io/linuxserver/heimdall:development
 ```
 
 ## Parameters
@@ -128,6 +130,7 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-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). |
+| `-e ALLOW_INTERNAL_REQUESTS=false` | By default, Heimdall blocks lookup requests to private or reserved IP addresses, if your instance is not exposed to the internet, or is behind some level of authentication, you can set this to `true` to allow requests to private IP addresses. |
 | `-v /config` | Persistent config files |
 
 ## Environment variables from files (Docker secrets)
@@ -194,7 +197,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * Image version number:
 
     ```bash
-    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/heimdall:latest
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/heimdall:development
     ```
 
 ## Updating Info
@@ -242,7 +245,7 @@ Below are the instructions for updating containers:
 * Update the image:
 
     ```bash
-    docker pull lscr.io/linuxserver/heimdall:latest
+    docker pull lscr.io/linuxserver/heimdall:development
     ```
 
 * Stop the running container:
@@ -279,7 +282,7 @@ cd docker-heimdall
 docker build \
   --no-cache \
   --pull \
-  -t lscr.io/linuxserver/heimdall:latest .
+  -t lscr.io/linuxserver/heimdall:development .
 ```
 
 The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`
@@ -292,6 +295,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **17.07.25:** - Rebase to Alpine 3.22, enable PHP environment passthrough.
 * **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.
@@ -300,23 +304,17 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 * **13.04.23:** - Move ssl.conf include to default.conf.
 * **20.01.23:** - Rebase to alpine 3.17 with php8.1.
 * **14.11.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
-* **04.11.22:** - Build commits to upstream branch 2.x for the `development` tag.
+* **04.11.22:** - Build commits to upstream branch 2.x.
 * **13.03.21:** - Make searchproviders.yaml user configurable.
+* **11.03.21:** - Rebase to alpine 3.14.
 * **10.02.21:** - Revert to alpine 3.12 as php 7.4 broke laravel.
 * **10.02.21:** - Rebasing to alpine 3.13.
-* **17.08.20:** - Add php7-curl.
 * **01.06.20:** - Rebasing to alpine 3.12.
-* **17.01.20:** - Use nginx from baseimage.
 * **19.12.19:** - Rebasing to alpine 3.11.
-* **16.07.19:** - Save laravel.log to /config/log/heimdall.
+* **15.07.19:** - Save laravel.log to /config, install heimdall during first start.
 * **28.06.19:** - Rebasing to alpine 3.10.
-* **01.04.19:** - Fix permission detect logic.
-* **26.03.19:** - Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown.
 * **23.03.19:** - Switching to new Base images, shift to arm32v7 tag.
-* **15.03.19:** - Clarify docker image tags in readme.
 * **22.02.19:** - Rebasing to alpine 3.9.
-* **16.01.18:** - Generate random app key in .env for new installs.
-* **20.11.18:** - Upgrade baseimage packages during build.
 * **04.11.18:** - Add php7-zip.
 * **31.10.18:** - Add queue service.
 * **17.10.18:** - Symlink avatars folder.

jenkins-vars.yml

@@ -2,10 +2,10 @@
 
 # jenkins variables
 project_name: docker-heimdall
-external_type: github_stable
+external_type: github_commit
-release_type: stable
+release_type: prerelease
-release_tag: latest
+release_tag: development
-ls_branch: master
+ls_branch: development
 repo_vars:
   - EXT_GIT_BRANCH = '2.x'
   - EXT_USER = 'linuxserver'

package_versions.txt

@@ -1,246 +1,245 @@
-NAME                                VERSION                TYPE           
+NAME                                VERSION           TYPE           
-Hidden Input                        1, 0, 0, 0             binary          
+Hidden Input                        1, 0, 0, 0        binary          
-alpine-baselayout                   3.6.5-r0               apk             
+acl-libs                            2.3.2-r1          apk             
-alpine-baselayout-data              3.6.5-r0               apk             
+alpine-baselayout                   3.7.0-r0          apk             
-alpine-keys                         2.4-r1                 apk             
+alpine-baselayout-data              3.7.0-r0          apk             
-alpine-release                      3.20.6-r0              apk             
+alpine-keys                         2.5-r0            apk             
-apache2-utils                       2.4.64-r0              apk             
+alpine-release                      3.22.3-r0         apk             
-apk-tools                           2.14.4-r1              apk             
+apache2-utils                       2.4.66-r0         apk             
-apr                                 1.7.5-r0               apk             
+apk-tools                           2.14.9-r3         apk             
-apr-util                            1.6.3-r1               apk             
+apr                                 1.7.5-r0          apk             
-argon2-libs                         20190702-r5            apk             
+apr-util                            1.6.3-r1          apk             
-aws/aws-crt-php                     v1.2.7                 php-composer    
+argon2-libs                         20190702-r5       apk             
-aws/aws-sdk-php                     3.349.3                php-composer    
+aws/aws-crt-php                     v1.2.7            php-composer    
-barryvdh/laravel-ide-helper         v3.5.5                 php-composer    
+aws/aws-sdk-php                     3.349.3           php-composer    
-barryvdh/reflection-docblock        v2.3.1                 php-composer    
+barryvdh/laravel-ide-helper         v3.5.5            php-composer    
-bash                                5.2.26-r0              apk             
+barryvdh/reflection-docblock        v2.3.1            php-composer    
-brick/math                          0.12.3                 php-composer    
+bash                                5.2.37-r0         apk             
-brotli-libs                         1.1.0-r2               apk             
+brick/math                          0.12.3            php-composer    
-busybox                             1.36.1-r29             apk             
+brotli-libs                         1.1.0-r2          apk             
-busybox-binsh                       1.36.1-r29             apk             
+busybox                             1.37.0-r20        apk             
-c-ares                              1.33.1-r0              apk             
+busybox-binsh                       1.37.0-r20        apk             
-ca-certificates                     20241121-r1            apk             
+c-ares                              1.34.6-r0         apk             
-ca-certificates-bundle              20241121-r1            apk             
+ca-certificates                     20250911-r0       apk             
-carbonphp/carbon-doctrine-types     3.2.0                  php-composer    
+ca-certificates-bundle              20250911-r0       apk             
-catatonit                           0.2.0-r0               apk             
+carbonphp/carbon-doctrine-types     3.2.0             php-composer    
-clue/stream-filter                  v1.7.0                 php-composer    
+catatonit                           0.2.1-r0          apk             
-composer                            2.8.10                 binary          
+clue/stream-filter                  v1.7.0            php-composer    
-composer/class-map-generator        1.6.1                  php-composer    
+composer                            2.9.5             binary          
-composer/pcre                       3.3.2                  php-composer    
+composer/class-map-generator        1.6.1             php-composer    
-coreutils                           9.5-r2                 apk             
+composer/pcre                       3.3.2             php-composer    
-coreutils-env                       9.5-r2                 apk             
+coreutils                           9.7-r1            apk             
-coreutils-fmt                       9.5-r2                 apk             
+coreutils-env                       9.7-r1            apk             
-coreutils-sha512sum                 9.5-r2                 apk             
+coreutils-fmt                       9.7-r1            apk             
-curl                                8.12.1-r0              apk             
+coreutils-sha512sum                 9.7-r1            apk             
-dflydev/dot-access-data             v3.0.3                 php-composer    
+curl                                8.14.1-r2         apk             
-doctrine/inflector                  2.0.10                 php-composer    
+dflydev/dot-access-data             v3.0.3            php-composer    
-doctrine/lexer                      3.0.1                  php-composer    
+doctrine/inflector                  2.0.10            php-composer    
-dragonmantank/cron-expression       v3.4.0                 php-composer    
+doctrine/lexer                      3.0.1             php-composer    
-egulias/email-validator             4.0.4                  php-composer    
+dragonmantank/cron-expression       v3.4.0            php-composer    
-enshrined/svg-sanitize              0.21.0                 php-composer    
+egulias/email-validator             4.0.4             php-composer    
-fakerphp/faker                      v1.24.1                php-composer    
+enshrined/svg-sanitize              0.21.0            php-composer    
-filp/whoops                         2.18.3                 php-composer    
+fakerphp/faker                      v1.24.1           php-composer    
-findutils                           4.9.0-r5               apk             
+filp/whoops                         2.18.3            php-composer    
-fruitcake/php-cors                  v1.3.0                 php-composer    
+findutils                           4.10.0-r0         apk             
-git                                 2.45.4-r0              apk             
+fruitcake/php-cors                  v1.3.0            php-composer    
-git-init-template                   2.45.4-r0              apk             
+git                                 2.49.1-r0         apk             
-gmp                                 6.3.0-r1               apk             
+git-init-template                   2.49.1-r0         apk             
-graham-campbell/bounded-cache       v3.0.0                 php-composer    
+graham-campbell/bounded-cache       v3.0.0            php-composer    
-graham-campbell/github              v12.8.0                php-composer    
+graham-campbell/github              v12.8.0           php-composer    
-graham-campbell/manager             v5.2.0                 php-composer    
+graham-campbell/manager             v5.2.0            php-composer    
-graham-campbell/result-type         v1.1.3                 php-composer    
+graham-campbell/result-type         v1.1.3            php-composer    
-guzzlehttp/guzzle                   7.9.3                  php-composer    
+guzzlehttp/guzzle                   7.9.3             php-composer    
-guzzlehttp/promises                 2.2.0                  php-composer    
+guzzlehttp/promises                 2.2.0             php-composer    
-guzzlehttp/psr7                     2.7.1                  php-composer    
+guzzlehttp/psr7                     2.7.1             php-composer    
-guzzlehttp/uri-template             v1.0.4                 php-composer    
+guzzlehttp/uri-template             v1.0.4            php-composer    
-hamcrest/hamcrest-php               v2.1.1                 php-composer    
+hamcrest/hamcrest-php               v2.1.1            php-composer    
-icu-data-en                         74.2-r1                apk             
+icu-data-en                         76.1-r1           apk             
-icu-libs                            74.2-r1                apk             
+icu-libs                            76.1-r1           apk             
-jq                                  1.7.1-r0               apk             
+jq                                  1.8.1-r0          apk             
-knplabs/github-api                  v3.16.0                php-composer    
+knplabs/github-api                  v3.16.0           php-composer    
-laravel/framework                   v11.45.1               php-composer    
+laravel/framework                   v11.45.1          php-composer    
-laravel/prompts                     v0.3.6                 php-composer    
+laravel/prompts                     v0.3.6            php-composer    
-laravel/serializable-closure        v2.0.4                 php-composer    
+laravel/serializable-closure        v2.0.4            php-composer    
-laravel/tinker                      v2.10.1                php-composer    
+laravel/tinker                      v2.10.1           php-composer    
-laravel/ui                          v4.6.1                 php-composer    
+laravel/ui                          v4.6.1            php-composer    
-lcobucci/jwt                        5.5.0                  php-composer    
+lcobucci/jwt                        5.5.0             php-composer    
-league/commonmark                   2.7.0                  php-composer    
+league/commonmark                   2.7.0             php-composer    
-league/config                       v1.2.0                 php-composer    
+league/config                       v1.2.0            php-composer    
-league/flysystem                    3.30.0                 php-composer    
+league/flysystem                    3.30.0            php-composer    
-league/flysystem-aws-s3-v3          3.29.0                 php-composer    
+league/flysystem-aws-s3-v3          3.29.0            php-composer    
-league/flysystem-local              3.30.0                 php-composer    
+league/flysystem-local              3.30.0            php-composer    
-league/mime-type-detection          1.16.0                 php-composer    
+league/mime-type-detection          1.16.0            php-composer    
-league/uri                          7.5.1                  php-composer    
+league/uri                          7.5.1             php-composer    
-league/uri-interfaces               7.5.0                  php-composer    
+league/uri-interfaces               7.5.0             php-composer    
-libacl                              2.3.2-r0               apk             
+libapk2                             2.14.9-r3         apk             
-libattr                             2.5.2-r0               apk             
+libattr                             2.5.2-r2          apk             
-libbsd                              0.12.2-r0              apk             
+libbsd                              0.12.2-r0         apk             
-libbz2                              1.0.8-r6               apk             
+libbz2                              1.0.8-r6          apk             
-libcrypto3                          3.3.4-r0               apk             
+libcrypto3                          3.5.5-r0          apk             
-libcurl                             8.12.1-r0              apk             
+libcurl                             8.14.1-r2         apk             
-libedit                             20240517.3.1-r0        apk             
+libedit                             20250104.3.1-r1   apk             
-libexpat                            2.7.0-r0               apk             
+libexpat                            2.7.5-r0          apk             
-libgcc                              13.2.1_git20240309-r1  apk             
+libgcc                              14.2.0-r6         apk             
-libidn2                             2.3.7-r0               apk             
+libidn2                             2.3.7-r0          apk             
-libintl                             0.22.5-r0              apk             
+libintl                             0.24.1-r0         apk             
-libmd                               1.1.0-r0               apk             
+libmd                               1.1.0-r0          apk             
-libncursesw                         6.4_p20240420-r2       apk             
+libncursesw                         6.5_p20250503-r0  apk             
-libpq                               16.9-r0                apk             
+libpq                               17.9-r0           apk             
-libproc2                            4.0.4-r0               apk             
+libproc2                            4.0.4-r3          apk             
-libpsl                              0.21.5-r1              apk             
+libpsl                              0.21.5-r3         apk             
-libssl3                             3.3.4-r0               apk             
+libssl3                             3.5.5-r0          apk             
-libstdc++                           13.2.1_git20240309-r1  apk             
+libstdc++                           14.2.0-r6         apk             
-libunistring                        1.2-r0                 apk             
+libunistring                        1.3-r0            apk             
-libuuid                             2.40.1-r1              apk             
+libuuid                             2.41-r9           apk             
-libxml2                             2.12.10-r0             apk             
+libxml2                             2.13.9-r0         apk             
-libzip                              1.10.1-r0              apk             
+libzip                              1.11.4-r0         apk             
-linux-pam                           1.6.0-r0               apk             
+linux-pam                           1.7.0-r4          apk             
-logrotate                           3.21.0-r1              apk             
+logrotate                           3.21.0-r1         apk             
-mockery/mockery                     1.6.12                 php-composer    
+mockery/mockery                     1.6.12            php-composer    
-monolog/monolog                     3.9.0                  php-composer    
+monolog/monolog                     3.9.0             php-composer    
-mtdowling/jmespath.php              2.8.0                  php-composer    
+mtdowling/jmespath.php              2.8.0             php-composer    
-musl                                1.2.5-r1               apk             
+musl                                1.2.5-r10         apk             
-musl-utils                          1.2.5-r1               apk             
+musl-utils                          1.2.5-r10         apk             
-myclabs/deep-copy                   1.13.3                 php-composer    
+myclabs/deep-copy                   1.13.3            php-composer    
-nano                                8.0-r0                 apk             
+nano                                8.4-r0            apk             
-ncurses-terminfo-base               6.4_p20240420-r2       apk             
+ncurses-terminfo-base               6.5_p20250503-r0  apk             
-nesbot/carbon                       3.10.1                 php-composer    
+nesbot/carbon                       3.10.1            php-composer    
-netcat-openbsd                      1.226-r0               apk             
+netcat-openbsd                      1.229.1-r0        apk             
-nette/schema                        v1.3.2                 php-composer    
+nette/schema                        v1.3.2            php-composer    
-nette/utils                         v4.0.7                 php-composer    
+nette/utils                         v4.0.7            php-composer    
-nghttp2-libs                        1.62.1-r0              apk             
+nghttp2-libs                        1.65.0-r0         apk             
-nginx                               1.26.3-r0              apk             
+nginx                               1.28.3-r0         apk             
-nikic/php-parser                    v5.5.0                 php-composer    
+nikic/php-parser                    v5.5.0            php-composer    
-nunomaduro/collision                v8.5.0                 php-composer    
+nunomaduro/collision                v8.5.0            php-composer    
-nunomaduro/termwind                 v2.3.1                 php-composer    
+nunomaduro/termwind                 v2.3.1            php-composer    
-oniguruma                           6.9.9-r0               apk             
+oniguruma                           6.9.10-r0         apk             
-openssl                             3.3.4-r0               apk             
+openssl                             3.5.5-r0          apk             
-pcre                                8.45-r3                apk             
+pcre2                               10.46-r0          apk             
-pcre2                               10.43-r0               apk             
+phar-io/manifest                    2.0.4             php-composer    
-phar-io/manifest                    2.0.4                  php-composer    
+phar-io/version                     3.2.1             php-composer    
-phar-io/version                     3.2.1                  php-composer    
+php-http/cache-plugin               2.0.1             php-composer    
-php-http/cache-plugin               2.0.1                  php-composer    
+php-http/client-common              2.7.2             php-composer    
-php-http/client-common              2.7.2                  php-composer    
+php-http/discovery                  1.20.0            php-composer    
-php-http/discovery                  1.20.0                 php-composer    
+php-http/httplug                    2.4.1             php-composer    
-php-http/httplug                    2.4.1                  php-composer    
+php-http/message                    1.16.2            php-composer    
-php-http/message                    1.16.2                 php-composer    
+php-http/multipart-stream-builder   1.4.2             php-composer    
-php-http/multipart-stream-builder   1.4.2                  php-composer    
+php-http/promise                    1.3.1             php-composer    
-php-http/promise                    1.3.1                  php-composer    
+php84                               8.4.16-r0         apk             
-php83                               8.3.15-r0              apk             
+php84-common                        8.4.16-r0         apk             
-php83-common                        8.3.15-r0              apk             
+php84-ctype                         8.4.16-r0         apk             
-php83-ctype                         8.3.15-r0              apk             
+php84-curl                          8.4.16-r0         apk             
-php83-curl                          8.3.15-r0              apk             
+php84-dom                           8.4.16-r0         apk             
-php83-dom                           8.3.15-r0              apk             
+php84-fileinfo                      8.4.16-r0         apk             
-php83-fileinfo                      8.3.15-r0              apk             
+php84-fpm                           8.4.16-r0         apk             
-php83-fpm                           8.3.15-r0              apk             
+php84-iconv                         8.4.16-r0         apk             
-php83-iconv                         8.3.15-r0              apk             
+php84-intl                          8.4.16-r0         apk             
-php83-intl                          8.3.15-r0              apk             
+php84-mbstring                      8.4.16-r0         apk             
-php83-mbstring                      8.3.15-r0              apk             
+php84-mysqlnd                       8.4.16-r0         apk             
-php83-mysqlnd                       8.3.15-r0              apk             
+php84-opcache                       8.4.16-r0         apk             
-php83-opcache                       8.3.15-r0              apk             
+php84-openssl                       8.4.16-r0         apk             
-php83-openssl                       8.3.15-r0              apk             
+php84-pdo                           8.4.16-r0         apk             
-php83-pdo                           8.3.15-r0              apk             
+php84-pdo_mysql                     8.4.16-r0         apk             
-php83-pdo_mysql                     8.3.15-r0              apk             
+php84-pdo_pgsql                     8.4.16-r0         apk             
-php83-pdo_pgsql                     8.3.15-r0              apk             
+php84-pdo_sqlite                    8.4.16-r0         apk             
-php83-pdo_sqlite                    8.3.15-r0              apk             
+php84-phar                          8.4.16-r0         apk             
-php83-phar                          8.3.15-r0              apk             
+php84-session                       8.4.16-r0         apk             
-php83-session                       8.3.15-r0              apk             
+php84-simplexml                     8.4.16-r0         apk             
-php83-simplexml                     8.3.15-r0              apk             
+php84-tokenizer                     8.4.16-r0         apk             
-php83-tokenizer                     8.3.15-r0              apk             
+php84-xml                           8.4.16-r0         apk             
-php83-xml                           8.3.15-r0              apk             
+php84-xmlwriter                     8.4.16-r0         apk             
-php83-xmlwriter                     8.3.15-r0              apk             
+php84-zip                           8.4.16-r0         apk             
-php83-zip                           8.3.15-r0              apk             
+phpoption/phpoption                 1.9.3             php-composer    
-phpoption/phpoption                 1.9.3                  php-composer    
+phpunit/php-code-coverage           10.1.16           php-composer    
-phpunit/php-code-coverage           10.1.16                php-composer    
+phpunit/php-file-iterator           4.1.0             php-composer    
-phpunit/php-file-iterator           4.1.0                  php-composer    
+phpunit/php-invoker                 4.0.0             php-composer    
-phpunit/php-invoker                 4.0.0                  php-composer    
+phpunit/php-text-template           3.0.1             php-composer    
-phpunit/php-text-template           3.0.1                  php-composer    
+phpunit/php-timer                   6.0.0             php-composer    
-phpunit/php-timer                   6.0.0                  php-composer    
+phpunit/phpunit                     10.5.47           php-composer    
-phpunit/phpunit                     10.5.47                php-composer    
+popt                                1.19-r4           apk             
-popt                                1.19-r3                apk             
+procps-ng                           4.0.4-r3          apk             
-procps-ng                           4.0.4-r0               apk             
+psr/cache                           3.0.0             php-composer    
-psr/cache                           3.0.0                  php-composer    
+psr/clock                           1.0.0             php-composer    
-psr/clock                           1.0.0                  php-composer    
+psr/container                       2.0.2             php-composer    
-psr/container                       2.0.2                  php-composer    
+psr/event-dispatcher                1.0.0             php-composer    
-psr/event-dispatcher                1.0.0                  php-composer    
+psr/http-client                     1.0.3             php-composer    
-psr/http-client                     1.0.3                  php-composer    
+psr/http-factory                    1.1.0             php-composer    
-psr/http-factory                    1.1.0                  php-composer    
+psr/http-message                    2.0               php-composer    
-psr/http-message                    2.0                    php-composer    
+psr/log                             3.0.2             php-composer    
-psr/log                             3.0.2                  php-composer    
+psr/simple-cache                    3.0.0             php-composer    
-psr/simple-cache                    3.0.0                  php-composer    
+psy/psysh                           v0.12.9           php-composer    
-psy/psysh                           v0.12.9                php-composer    
+ralouphie/getallheaders             3.0.3             php-composer    
-ralouphie/getallheaders             3.0.3                  php-composer    
+ramsey/collection                   2.1.1             php-composer    
-ramsey/collection                   2.1.1                  php-composer    
+ramsey/uuid                         4.9.0             php-composer    
-ramsey/uuid                         4.9.0                  php-composer    
+readline                            8.2.13-r1         apk             
-readline                            8.2.10-r0              apk             
+scanelf                             1.3.8-r1          apk             
-scanelf                             1.3.7-r2               apk             
+sebastian/cli-parser                2.0.1             php-composer    
-sebastian/cli-parser                2.0.1                  php-composer    
+sebastian/code-unit                 2.0.0             php-composer    
-sebastian/code-unit                 2.0.0                  php-composer    
+sebastian/code-unit-reverse-lookup  3.0.0             php-composer    
-sebastian/code-unit-reverse-lookup  3.0.0                  php-composer    
+sebastian/comparator                5.0.3             php-composer    
-sebastian/comparator                5.0.3                  php-composer    
+sebastian/complexity                3.2.0             php-composer    
-sebastian/complexity                3.2.0                  php-composer    
+sebastian/diff                      5.1.1             php-composer    
-sebastian/diff                      5.1.1                  php-composer    
+sebastian/environment               6.1.0             php-composer    
-sebastian/environment               6.1.0                  php-composer    
+sebastian/exporter                  5.1.2             php-composer    
-sebastian/exporter                  5.1.2                  php-composer    
+sebastian/global-state              6.0.2             php-composer    
-sebastian/global-state              6.0.2                  php-composer    
+sebastian/lines-of-code             2.0.2             php-composer    
-sebastian/lines-of-code             2.0.2                  php-composer    
+sebastian/object-enumerator         5.0.0             php-composer    
-sebastian/object-enumerator         5.0.0                  php-composer    
+sebastian/object-reflector          3.0.0             php-composer    
-sebastian/object-reflector          3.0.0                  php-composer    
+sebastian/recursion-context         5.0.0             php-composer    
-sebastian/recursion-context         5.0.0                  php-composer    
+sebastian/type                      4.0.0             php-composer    
-sebastian/type                      4.0.0                  php-composer    
+sebastian/version                   4.0.1             php-composer    
-sebastian/version                   4.0.1                  php-composer    
+shadow                              4.17.3-r0         apk             
-shadow                              4.15.1-r0              apk             
+skalibs-libs                        2.14.4.0-r0       apk             
-skalibs                             2.14.1.1-r0            apk             
+spatie/backtrace                    1.7.4             php-composer    
-spatie/backtrace                    1.7.4                  php-composer    
+spatie/error-solutions              1.1.3             php-composer    
-spatie/error-solutions              1.1.3                  php-composer    
+spatie/flare-client-php             1.10.1            php-composer    
-spatie/flare-client-php             1.10.1                 php-composer    
+spatie/ignition                     1.15.1            php-composer    
-spatie/ignition                     1.15.1                 php-composer    
+spatie/laravel-html                 3.12.0            php-composer    
-spatie/laravel-html                 3.12.0                 php-composer    
+spatie/laravel-ignition             2.9.1             php-composer    
-spatie/laravel-ignition             2.9.1                  php-composer    
+sqlite-libs                         3.49.2-r1         apk             
-sqlite-libs                         3.45.3-r2              apk             
+squizlabs/php_codesniffer           3.13.2            php-composer    
-squizlabs/php_codesniffer           3.13.2                 php-composer    
+ssl_client                          1.37.0-r20        apk             
-ssl_client                          1.36.1-r29             apk             
+symfony/cache                       v7.3.1            php-composer    
-symfony/cache                       v7.3.1                 php-composer    
+symfony/cache-contracts             v3.6.0            php-composer    
-symfony/cache-contracts             v3.6.0                 php-composer    
+symfony/clock                       v7.3.0            php-composer    
-symfony/clock                       v7.3.0                 php-composer    
+symfony/console                     v7.3.1            php-composer    
-symfony/console                     v7.3.1                 php-composer    
+symfony/css-selector                v7.3.0            php-composer    
-symfony/css-selector                v7.3.0                 php-composer    
+symfony/deprecation-contracts       v3.6.0            php-composer    
-symfony/deprecation-contracts       v3.6.0                 php-composer    
+symfony/error-handler               v7.3.1            php-composer    
-symfony/error-handler               v7.3.1                 php-composer    
+symfony/event-dispatcher            v7.3.0            php-composer    
-symfony/event-dispatcher            v7.3.0                 php-composer    
+symfony/event-dispatcher-contracts  v3.6.0            php-composer    
-symfony/event-dispatcher-contracts  v3.6.0                 php-composer    
+symfony/finder                      v7.3.0            php-composer    
-symfony/finder                      v7.3.0                 php-composer    
+symfony/http-foundation             v7.3.1            php-composer    
-symfony/http-foundation             v7.3.1                 php-composer    
+symfony/http-kernel                 v7.3.1            php-composer    
-symfony/http-kernel                 v7.3.1                 php-composer    
+symfony/mailer                      v7.3.1            php-composer    
-symfony/mailer                      v7.3.1                 php-composer    
+symfony/mime                        v7.3.0            php-composer    
-symfony/mime                        v7.3.0                 php-composer    
+symfony/options-resolver            v7.3.0            php-composer    
-symfony/options-resolver            v7.3.0                 php-composer    
+symfony/polyfill-ctype              v1.32.0           php-composer    
-symfony/polyfill-ctype              v1.32.0                php-composer    
+symfony/polyfill-intl-grapheme      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-idn           v1.32.0                php-composer    
+symfony/polyfill-intl-normalizer    v1.32.0           php-composer    
-symfony/polyfill-intl-normalizer    v1.32.0                php-composer    
+symfony/polyfill-mbstring           v1.32.0           php-composer    
-symfony/polyfill-mbstring           v1.32.0                php-composer    
+symfony/polyfill-php80              v1.32.0           php-composer    
-symfony/polyfill-php80              v1.32.0                php-composer    
+symfony/polyfill-php83              v1.32.0           php-composer    
-symfony/polyfill-php83              v1.32.0                php-composer    
+symfony/polyfill-uuid               v1.32.0           php-composer    
-symfony/polyfill-uuid               v1.32.0                php-composer    
+symfony/process                     v7.3.0            php-composer    
-symfony/process                     v7.3.0                 php-composer    
+symfony/routing                     v7.3.0            php-composer    
-symfony/routing                     v7.3.0                 php-composer    
+symfony/service-contracts           v3.6.0            php-composer    
-symfony/service-contracts           v3.6.0                 php-composer    
+symfony/string                      v7.3.0            php-composer    
-symfony/string                      v7.3.0                 php-composer    
+symfony/thanks                      v1.4.0            php-composer    
-symfony/thanks                      v1.4.0                 php-composer    
+symfony/translation                 v7.3.1            php-composer    
-symfony/translation                 v7.3.1                 php-composer    
+symfony/translation-contracts       v3.6.0            php-composer    
-symfony/translation-contracts       v3.6.0                 php-composer    
+symfony/uid                         v7.3.1            php-composer    
-symfony/uid                         v7.3.1                 php-composer    
+symfony/var-dumper                  v7.3.1            php-composer    
-symfony/var-dumper                  v7.3.1                 php-composer    
+symfony/var-exporter                v7.3.0            php-composer    
-symfony/var-exporter                v7.3.0                 php-composer    
+symfony/yaml                        v7.3.1            php-composer    
-symfony/yaml                        v7.3.1                 php-composer    
+theseer/tokenizer                   1.2.3             php-composer    
-theseer/tokenizer                   1.2.3                  php-composer    
+tijsverkoyen/css-to-inline-styles   v2.3.0            php-composer    
-tijsverkoyen/css-to-inline-styles   v2.3.0                 php-composer    
+tzdata                              2026a-r0          apk             
-tzdata                              2025b-r0               apk             
+utmps-libs                          0.1.3.1-r0        apk             
-utmps-libs                          0.1.2.2-r1             apk             
+vlucas/phpdotenv                    v5.6.2            php-composer    
-vlucas/phpdotenv                    v5.6.2                 php-composer    
+voku/portable-ascii                 2.0.3             php-composer    
-voku/portable-ascii                 2.0.3                  php-composer    
+webmozart/assert                    1.11.0            php-composer    
-webmozart/assert                    1.11.0                 php-composer    
+xz-libs                             5.8.1-r0          apk             
-xz-libs                             5.6.2-r1               apk             
+zlib                                1.3.1-r2          apk             
-zlib                                1.3.1-r1               apk             
+zstd-libs                           1.5.7-r0          apk             
-zstd-libs                           1.5.6-r0               apk             

readme-vars.yml

@@ -11,7 +11,6 @@ project_blurb: |
 
   Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
-project_categories: "Dashboard"
 # supported architectures
 available_architectures:
   - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
@@ -31,6 +30,9 @@ param_usage_include_ports: true
 param_ports:
   - {external_port: "80", internal_port: "80", port_desc: "http gui"}
   - {external_port: "443", internal_port: "443", port_desc: "https gui"}
+opt_param_usage_include_env: true
+opt_param_env_vars:
+  - {env_var: "ALLOW_INTERNAL_REQUESTS", env_value: "false", desc: "By default, Heimdall blocks lookup requests to private or reserved IP addresses, if your instance is not exposed to the internet, or is behind some level of authentication, you can set this to `true` to allow requests to private IP addresses."}
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -41,7 +43,7 @@ app_setup_block: |
   This image now supports password protection through htpasswd. Run the following command on your host to generate the htpasswd file `docker exec -it heimdall htpasswd -c /config/nginx/.htpasswd <username>`. Replace <username> with a username of your choice and you will be asked to enter a password. Uncomment the `basic auth` lines in `/config/nginx/site-confs/default.conf` and restart the container.
 # init diagram
 init_diagram: |
-  "heimdall:latest": {
+  "heimdall:development": {
     docker-mods
     base {
       fix-attr +\nlegacy cont-init
@@ -57,8 +59,9 @@ init_diagram: |
     init-nginx-end -> init-config
     init-os-end -> init-config
     init-config -> init-config-end
+    init-crontab-config -> init-config-end
     init-heimdall-config -> init-config-end
-    init-os-end -> init-crontab-config
+    init-config -> init-crontab-config
     init-mods-end -> init-custom-files
     init-adduser -> init-device-perms
     base -> init-envfile
@@ -66,25 +69,19 @@ init_diagram: |
     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
+    init-version-checks -> 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
     init-nginx -> init-php
     init-folders -> init-samples
     init-custom-files -> init-services
-    init-mods-end -> init-services
+    init-permissions -> init-version-checks
-    init-config-end -> init-version-checks
     init-services -> svc-cron
     svc-cron -> legacy-services
     init-services -> svc-nginx
@@ -95,11 +92,12 @@ init_diagram: |
     svc-queue -> legacy-services
   }
   Base Images: {
-    "baseimage-alpine-nginx:3.20" <- "baseimage-alpine:3.20"
+    "baseimage-alpine-nginx:3.22" <- "baseimage-alpine:3.22"
   }
-  "heimdall:latest" <- Base Images
+  "heimdall:development" <- Base Images
 # changelog
 changelogs:
+  - {date: "17.07.25:", desc: "Rebase to Alpine 3.22, enable PHP environment passthrough."}
   - {date: "27.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."}
   - {date: "07.03.24:", desc: "Enable the opcache and disable file revalidation."}
   - {date: "06.03.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf."}
@@ -108,23 +106,17 @@ changelogs:
   - {date: "13.04.23:", desc: "Move ssl.conf include to default.conf."}
   - {date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1."}
   - {date: "14.11.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))."}
-  - {date: "04.11.22:", desc: "Build commits to upstream branch 2.x for the `development` tag."}
+  - {date: "04.11.22:", desc: "Build commits to upstream branch 2.x."}
   - {date: "13.03.21:", desc: "Make searchproviders.yaml user configurable."}
+  - {date: "11.03.21:", desc: "Rebase to alpine 3.14."}
   - {date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel."}
   - {date: "10.02.21:", desc: "Rebasing to alpine 3.13."}
-  - {date: "17.08.20:", desc: "Add php7-curl."}
   - {date: "01.06.20:", desc: "Rebasing to alpine 3.12."}
-  - {date: "17.01.20:", desc: "Use nginx from baseimage."}
   - {date: "19.12.19:", desc: "Rebasing to alpine 3.11."}
-  - {date: "16.07.19:", desc: "Save laravel.log to /config/log/heimdall."}
+  - {date: "15.07.19:", desc: "Save laravel.log to /config, install heimdall during first start."}
   - {date: "28.06.19:", desc: "Rebasing to alpine 3.10."}
-  - {date: "01.04.19:", desc: "Fix permission detect logic."}
-  - {date: "26.03.19:", desc: "Install Heimdall during container start to prevent delayed start due to overlayfs bug with recursive chown."}
   - {date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag."}
-  - {date: "15.03.19:", desc: "Clarify docker image tags in readme."}
   - {date: "22.02.19:", desc: "Rebasing to alpine 3.9."}
-  - {date: "16.01.18:", desc: "Generate random app key in .env for new installs."}
-  - {date: "20.11.18:", desc: "Upgrade baseimage packages during build."}
   - {date: "04.11.18:", desc: "Add php7-zip."}
   - {date: "31.10.18:", desc: "Add queue service."}
   - {date: "17.10.18:", desc: "Symlink avatars folder."}