Bot Updating Templated Files

Bot Updating Package Versions
2026-02-22 20:30:31 +09:00 · 2024-02-23 18:32:34 +00:00 · 2024-02-23 18:29:08 +00:00 · 2024-02-17 15:45:06 +00:00 · 2024-02-17 10:41:06 -05:00 · 2024-02-17 14:46:08 +00:00
16 changed files with 614 additions and 561 deletions
--- a/.github/ISSUE_TEMPLATE/issue.bug.yml
+++ b/.github/ISSUE_TEMPLATE/issue.bug.yml
@@ -53,7 +53,6 @@ body:
      options:
        - x86-64
        - arm64
-        - armhf
    validations:
      required: true
  - type: textarea
@@ -68,10 +67,10 @@ body:
  - type: textarea
    attributes:
      description: |
-        Provide a full docker log, output of "docker logs linuxserver.io"
+        Provide a full docker log, output of "docker logs heimdall"
      label: Container logs
      placeholder: |
-        Output of `docker logs linuxserver.io`
+        Output of `docker logs heimdall`
      render: bash
    validations:
      required: true
--- a/.github/workflows/call_issue_pr_tracker.yml
+++ b/.github/workflows/call_issue_pr_tracker.yml
@@ -2,9 +2,11 @@ name: Issue & PR Tracker

 on:
  issues:
-    types: [opened,reopened,labeled,unlabeled]
+    types: [opened,reopened,labeled,unlabeled,closed]
  pull_request_target:
-    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled]
+    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
+  pull_request_review:
+    types: [submitted,edited,dismissed]

 jobs:
  manage-project:
--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -7,16 +7,18 @@ jobs:
  external-trigger-development:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1

      - name: External Trigger
        if: github.ref == 'refs/heads/development'
        run: |
          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT }}" ]; then
            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
          echo "**** External trigger running off of development branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT\". ****"
+          echo "External trigger running off of development branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_HEIMDALL_DEVELOPMENT\`" >> $GITHUB_STEP_SUMMARY
          echo "**** Retrieving external version ****"
          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)
          if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
@@ -30,6 +32,7 @@ jobs:
          fi
          EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
          echo "**** External version: ${EXT_RELEASE} ****"
+          echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
          echo "**** Retrieving last pushed version ****"
          image="linuxserver/heimdall"
          tag="development"
@@ -65,14 +68,18 @@ jobs:
            exit 1
          fi
          echo "**** Last pushed version: ${IMAGE_VERSION} ****"
+          echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY
          if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
            echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
+            echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
            exit 0
          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/lastBuild/api/json | jq -r '.building') == "true" ]; then
            echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
+            echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
            exit 0
          else
            echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
+            echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
            response=$(curl -iX POST \
              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|")
@@ -82,6 +89,7 @@ jobs:
            buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
            buildurl="${buildurl%$'\r'}"
            echo "**** Jenkins job build url: ${buildurl} ****"
+            echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
            echo "**** Attempting to change the Jenkins job description ****"
            curl -iX POST \
              "${buildurl}submitDescription" \
--- a/.github/workflows/external_trigger_scheduler.yml
+++ b/.github/workflows/external_trigger_scheduler.yml
@@ -2,14 +2,14 @@ name: External Trigger Scheduler

 on:
  schedule:
-    - cron:  '35 * * * *'
+    - cron:  '39 * * * *'
  workflow_dispatch:

 jobs:
  external-trigger-scheduler:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
        with:
          fetch-depth: '0'

@@ -17,18 +17,18 @@ jobs:
        run: |
          echo "**** Branches found: ****"
          git for-each-ref --format='%(refname:short)' refs/remotes
-          echo "**** Pulling the yq docker image ****"
-          docker pull ghcr.io/linuxserver/yq
          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
          do
            br=$(echo "$br" | sed 's|origin/||g')
            echo "**** Evaluating branch ${br} ****"
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml \
-              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
-            if [ "$br" == "$ls_branch" ]; then
-              echo "**** Branch ${br} appears to be live; checking workflow. ****"
+            ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml)
+            ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch')
+            ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type')
+            if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then
+              echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****"
              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
                echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
+                echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
                curl -iX POST \
                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
                  -H "Accept: application/vnd.github.v3+json" \
@@ -36,8 +36,10 @@ jobs:
                  https://api.github.com/repos/linuxserver/docker-heimdall/actions/workflows/external_trigger.yml/dispatches
              else
                echo "**** Workflow doesn't exist; skipping trigger. ****"
+                echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY
              fi
            else
-              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
+              echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****"
+              echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY
            fi
          done
--- a/.github/workflows/package_trigger.yml
+++ b/.github/workflows/package_trigger.yml
@@ -7,20 +7,23 @@ jobs:
  package-trigger-development:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1

      - name: Package Trigger
        if: github.ref == 'refs/heads/development'
        run: |
          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT }}" ]; then
            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/lastBuild/api/json | jq -r '.building') == "true" ]; then
            echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
+            echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
          echo "**** Package trigger running off of development branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT\". ****"
+          echo "Package trigger running off of development branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_HEIMDALL_DEVELOPMENT\`" >> $GITHUB_STEP_SUMMARY
          response=$(curl -iX POST \
            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-heimdall/job/development/buildWithParameters?PACKAGE_CHECK=true \
            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
@@ -30,6 +33,7 @@ jobs:
          buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
          buildurl="${buildurl%$'\r'}"
          echo "**** Jenkins job build url: ${buildurl} ****"
+          echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
          echo "**** Attempting to change the Jenkins job description ****"
          curl -iX POST \
            "${buildurl}submitDescription" \
--- a/.github/workflows/package_trigger_scheduler.yml
+++ b/.github/workflows/package_trigger_scheduler.yml
@@ -9,7 +9,7 @@ jobs:
  package-trigger-scheduler:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v4.1.1
        with:
          fetch-depth: '0'

@@ -17,18 +17,16 @@ jobs:
        run: |
          echo "**** Branches found: ****"
          git for-each-ref --format='%(refname:short)' refs/remotes
-          echo "**** Pulling the yq docker image ****"
-          docker pull ghcr.io/linuxserver/yq
          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
          do
            br=$(echo "$br" | sed 's|origin/||g')
            echo "**** Evaluating branch ${br} ****"
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml \
-              | docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
+            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/jenkins-vars.yml | yq -r '.ls_branch')
            if [ "${br}" == "${ls_branch}" ]; then
              echo "**** Branch ${br} appears to be live; checking workflow. ****"
              if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-heimdall/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then
                echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****"
+                echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY
                triggered_branches="${triggered_branches}${br} "
                curl -iX POST \
                  -H "Authorization: token ${{ secrets.CR_PAT }}" \
@@ -38,9 +36,11 @@ jobs:
                sleep 30
              else
                echo "**** Workflow doesn't exist; skipping trigger. ****"
+                echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY
              fi
            else
              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
+              echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY
            fi
          done
          echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****"
--- a/18
+++ b/18
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19

 # set version label
 ARG BUILD_DATE
@@ -14,15 +14,13 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2

 RUN \
  echo "**** install runtime packages ****" && \
-  apk add --no-cache --upgrade \
-    php81-ctype \
-    php81-curl \
-    php81-intl \
-    php81-pdo_pgsql \
-    php81-pdo_sqlite \
-    php81-pdo_mysql \
-    php81-tokenizer \
-    php81-zip && \
+  apk add --no-cache \
+    php83-dom \
+    php83-intl \
+    php83-pdo_pgsql \
+    php83-pdo_sqlite \
+    php83-pdo_mysql \
+    php83-tokenizer && \
  echo "**** configure nginx ****" && \
  echo 'fastcgi_param  PHP_AUTH_USER      $remote_user; # Heimdall user authorization' >> \
    /etc/nginx/fastcgi_params && \
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1

-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19

 # set version label
 ARG BUILD_DATE
@@ -14,15 +14,13 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2

 RUN \
  echo "**** install runtime packages ****" && \
-  apk add --no-cache --upgrade \
-    php81-ctype \
-    php81-curl \
-    php81-intl \
-    php81-pdo_pgsql \
-    php81-pdo_sqlite \
-    php81-pdo_mysql \
-    php81-tokenizer \
-    php81-zip && \
+  apk add --no-cache \
+    php83-dom \
+    php83-intl \
+    php83-pdo_pgsql \
+    php83-pdo_sqlite \
+    php83-pdo_mysql \
+    php83-tokenizer && \
  echo "**** configure nginx ****" && \
  echo 'fastcgi_param  PHP_AUTH_USER      $remote_user; # Heimdall user authorization' >> \
    /etc/nginx/fastcgi_params && \
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,55 +0,0 @@
-# syntax=docker/dockerfile:1
-
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17
-
-# set version label
-ARG BUILD_DATE
-ARG VERSION
-ARG HEIMDALL_RELEASE
-LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="aptalca"
-
-# environment settings
-ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
-
-RUN \
-  echo "**** install runtime packages ****" && \
-  apk add --no-cache --upgrade \
-    php81-ctype \
-    php81-curl \
-    php81-intl \
-    php81-pdo_pgsql \
-    php81-pdo_sqlite \
-    php81-pdo_mysql \
-    php81-tokenizer \
-    php81-zip && \
-  echo "**** configure nginx ****" && \
-  echo 'fastcgi_param  PHP_AUTH_USER      $remote_user; # Heimdall user authorization' >> \
-    /etc/nginx/fastcgi_params && \
-  echo 'fastcgi_param  PHP_AUTH_PW        $http_authorization; # Heimdall user authorization' >> \
-    /etc/nginx/fastcgi_params && \
-  echo "**** install heimdall ****" && \
-  mkdir -p \
-    /heimdall && \
-  if [ -z ${HEIMDALL_RELEASE+x} ]; then \
-    HEIMDALL_RELEASE=$(curl -sX GET "https://api.github.com/repos/linuxserver/Heimdall/commits/2.x" \
-    | awk '/sha/{print $4;exit}' FS='[""]'); \
-  fi && \
-  curl -o \
-    /tmp/heimdall.tar.gz -L \
-    "https://github.com/linuxserver/Heimdall/archive/${HEIMDALL_RELEASE}.tar.gz" && \
-  mkdir -p \
-    /app/www-tmp && \
-  tar xf \
-    /tmp/heimdall.tar.gz -C \
-    /app/www-tmp --strip-components=1 && \
-  echo "**** cleanup ****" && \
-  rm -rf \
-    /tmp/*
-
-# add local files
-COPY root/ /
-
-# ports and volumes
-EXPOSE 80 443
-VOLUME /config
--- a/438
+++ b/438
@@ -16,7 +16,7 @@ pipeline {
    GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
    GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
    GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
-    SCARF_TOKEN=credentials('scarf_api_key')
+    DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat')
    EXT_GIT_BRANCH = '2.x'
    EXT_USER = 'linuxserver'
    EXT_REPO = 'Heimdall'
@@ -42,10 +42,16 @@ pipeline {
    // Setup all the basic environment variables needed for the build
    stage("Set ENV Variables base"){
      steps{
+        sh '''#! /bin/bash
+              containers=$(docker ps -aq)
+              if [[ -n "${containers}" ]]; then
+                docker stop ${containers}
+              fi
+              docker system prune -af --volumes || : '''
        script{
          env.EXIT_STATUS = ''
          env.LS_RELEASE = sh(
-            script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':development 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' ''',
@@ -56,11 +62,16 @@ pipeline {
          env.COMMIT_SHA = sh(
            script: '''git rev-parse HEAD''',
            returnStdout: true).trim()
+          env.GH_DEFAULT_BRANCH = sh(
+            script: '''git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||' ''',
+            returnStdout: true).trim()
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
          env.PULL_REQUEST = env.CHANGE_ID
          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
        }
+        sh '''#! /bin/bash
+              echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" '''
        script{
          env.LS_RELEASE_NUMBER = sh(
            script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''',
@@ -125,7 +136,7 @@ pipeline {
      steps{
        script{
          env.EXT_RELEASE_CLEAN = sh(
-            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
+            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/ ]//g' ''',
            returnStdout: true).trim()

          def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
@@ -143,7 +154,7 @@ pipeline {
          }

          if (env.SEMVER != null) {
-            if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
+            if (BRANCH_NAME != "${env.GH_DEFAULT_BRANCH}") {
              env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
            }
            println("SEMVER: ${env.SEMVER}")
@@ -167,7 +178,7 @@ 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-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-development-' + 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 = 'development-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          }
@@ -190,7 +201,7 @@ 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-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-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
+            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 = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          }
@@ -213,12 +224,12 @@ 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-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-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 = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-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 + '-pr-' + env.PULL_REQUEST
-          env.META_TAG = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-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 = 'development-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
          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/'
@@ -238,15 +249,17 @@ pipeline {
          script{
            env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
          }
-          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
+          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-jenkins-builder/master/checkrun.sh | /bin/bash'''
          sh '''#! /bin/bash
                docker run --rm \
                  -v ${WORKSPACE}:/mnt \
                  -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
                  -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                  ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
-                    apk add --no-cache py3-pip && \
-                    pip install s3cmd && \
+                  ghcr.io/linuxserver/baseimage-alpine:3.19 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 && \
+                    pip install --no-cache-dir s3cmd && \
                    s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
        }
      }
@@ -275,7 +288,8 @@ pipeline {
                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                git add Jenkinsfile
                git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Updating Jenkinsfile"
                rm -Rf ${TEMPDIR}
@@ -284,7 +298,7 @@ pipeline {
                echo "Jenkinsfile is up to date."
              fi
              # Stage 2 - Delete old templates
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
              for i in ${OLD_TEMPLATES}; do
                if [[ -f "${i}" ]]; then
                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -299,7 +313,8 @@ pipeline {
                  git rm "${i}"
                done
                git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Deleting old and deprecated templates"
                rm -Rf ${TEMPDIR}
@@ -320,35 +335,46 @@ pipeline {
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
+                cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
                cd ${TEMPDIR}/repo/${LS_REPO}/
                if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
                  echo ".jenkins-external" >> .gitignore
                  git add .gitignore
                fi
-                git add ${TEMPLATED_FILES}
+                git add readme-vars.yml ${TEMPLATED_FILES}
                git commit -m 'Bot Updating Templated Files'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
              else
                echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
              fi
-              mkdir -p ${TEMPDIR}/gitbook
-              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/gitbook/docker-documentation/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
-                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/gitbook/docker-documentation/images/
-                cd ${TEMPDIR}/gitbook/docker-documentation/
-                git add images/docker-${CONTAINER_NAME}.md
+              mkdir -p ${TEMPDIR}/docs
+              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}"  ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
+                cd ${TEMPDIR}/docs/docker-documentation
+                GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
+                git add docs/images/docker-${CONTAINER_NAME}.md
                git commit -m 'Bot Updating Documentation'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to docs failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH})
              fi
              mkdir -p ${TEMPDIR}/unraid
              git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
              git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
              if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
+              elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
+                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
              fi
-              if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
                cd ${TEMPDIR}/unraid/templates/
+                GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
                  echo "Image is on the ignore list, marking Unraid template as deprecated"
                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
@@ -360,7 +386,31 @@ pipeline {
                  git add unraid/${CONTAINER_NAME}.xml
                  git commit -m 'Bot Updating Unraid Template'
                fi
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} || \
+                  (MAXWAIT="10" && echo "Push to unraid templates failed, trying again in ${MAXWAIT} seconds" && \
+                  sleep $((RANDOM % MAXWAIT)) && \
+                  git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH} --rebase && \
+                  git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/templates.git ${GH_TEMPLATES_DEFAULT_BRANCH})
+              fi
+              # Stage 4 - Sync Readme to Docker Hub
+              if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then
+                if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then
+                  echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub"
+                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite"
+                else
+                  echo "Syncing readme to Docker Hub"
+                  DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md"
+                fi
+                DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token')
+                curl -s \
+                  -H "Authorization: JWT ${DH_TOKEN}" \
+                  -H "Content-Type: application/json" \
+                  -X PATCH \
+                  -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \
+                  https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || :
+              else
+                echo "Not the default Github branch. Skipping readme sync to Docker Hub."
              fi
              rm -Rf ${TEMPDIR}'''
        script{
@@ -386,6 +436,26 @@ pipeline {
        }
      }
    }
+    // If this is a development build check the S6 service file perms
+    stage("Check S6 Service file Permissions"){
+      when {
+        branch "development"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        script{
+          sh '''#! /bin/bash
+            WRONG_PERM=$(find ./  -path "./.git" -prune -o \\( -name "run" -o -name "finish" -o -name "check" \\) -not -perm -u=x,g=x,o=x -print)
+            if [[ -n "${WRONG_PERM}" ]]; then
+              echo "The following S6 service files are missing the executable bit; canceling the faulty build: ${WRONG_PERM}"
+              exit 1
+            else
+              echo "S6 service file perms look good."
+            fi '''
+        }
+      }
+    }
    /* #######################
           GitLab Mirroring
       ####################### */
@@ -406,36 +476,6 @@ pipeline {
             "visibility":"public"}' '''
      } 
    }
-    /* #######################
-           Scarf.sh package registry
-       ####################### */
-    // Add package to Scarf.sh and set permissions
-    stage("Scarf.sh package registry"){
-      when {
-        branch "development"
-        environment name: 'EXIT_STATUS', value: ''
-      }
-      steps{
-        sh '''#! /bin/bash
-              set -e
-              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/heimdall") | .uuid')
-              if [ -z "${PACKAGE_UUID}" ]; then
-                echo "Adding package to Scarf.sh"
-                curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
-                  -H "Authorization: Bearer ${SCARF_TOKEN}" \
-                  -H "Content-Type: application/json" \
-                  -d '{"name":"linuxserver/heimdall",\
-                       "shortDescription":"example description",\
-                       "libraryType":"docker",\
-                       "website":"https://github.com/linuxserver/docker-heimdall",\
-                       "backendUrl":"https://ghcr.io/linuxserver/heimdall",\
-                       "publicUrl":"https://lscr.io/linuxserver/heimdall"}' || :
-              else
-                echo "Package already exists on Scarf.sh"
-              fi
-           '''
-      } 
-    }
    /* ###############
       Build Container
       ############### */
@@ -498,41 +538,6 @@ pipeline {
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
          }
        }
-        stage('Build ARMHF') {
-          agent {
-            label 'ARMHF'
-          }
-          steps {
-            echo "Running on node: ${NODE_NAME}"
-            echo 'Logging into Github'
-            sh '''#! /bin/bash
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-               '''
-            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf"
-            sh "docker buildx build \
-              --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
-              --label \"org.opencontainers.image.authors=linuxserver.io\" \
-              --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-heimdall/packages\" \
-              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-heimdall\" \
-              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-heimdall\" \
-              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
-              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
-              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
-              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
-              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
-              --label \"org.opencontainers.image.title=Heimdall\" \
-              --label \"org.opencontainers.image.description=[Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way.    Simplicity is the key to Heimdall.    Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.  \" \
-              --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \
-              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-            sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-            retry(5) {
-              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-            }
-            sh '''docker rmi \
-                  ${IMAGE}:arm32v7-${META_TAG} \
-                  ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
-          }
-        }
        stage('Build ARM64') {
          agent {
            label 'ARM64'
@@ -563,9 +568,12 @@ pipeline {
            retry(5) {
              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
            }
-            sh '''docker rmi \
-                  ${IMAGE}:arm64v8-${META_TAG} \
-                  ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
+            sh '''#! /bin/bash
+                  containers=$(docker ps -aq)
+                  if [[ -n "${containers}" ]]; then
+                    docker stop ${containers}
+                  fi
+                  docker system prune -af --volumes || : '''
          }
        }
      }
@@ -602,7 +610,8 @@ pipeline {
                wait
                git add package_versions.txt
                git commit -m 'Bot Updating Package Versions'
-                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
+                git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
+                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git development
                echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}
                echo "Package tag updated, stopping build process"
              else
@@ -626,13 +635,6 @@ pipeline {
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        sh '''#! /bin/bash
-              echo "Packages were updated. Cleaning up the image and exiting."
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
-                docker rmi ${IMAGE}:amd64-${META_TAG}
-              else
-                docker rmi ${IMAGE}:${META_TAG}
-              fi'''
        script{
          env.EXIT_STATUS = 'ABORTED'
        }
@@ -650,13 +652,6 @@ pipeline {
        }
      }
      steps {
-        sh '''#! /bin/bash
-              echo "There are no package updates. Cleaning up the image and exiting."
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
-                docker rmi ${IMAGE}:amd64-${META_TAG}
-              else
-                docker rmi ${IMAGE}:${META_TAG}
-              fi'''
        script{
          env.EXIT_STATUS = 'ABORTED'
        }
@@ -678,14 +673,13 @@ pipeline {
        ]) {
          script{
            env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
+            env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json'
          }
          sh '''#! /bin/bash
                set -e
                docker pull ghcr.io/linuxserver/ci:latest
                if [ "${MULTIARCH}" == "true" ]; then
-                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                fi
                docker run --rm \
@@ -704,8 +698,6 @@ pipeline {
                -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                -e WEB_AUTH=\"${CI_AUTH}\" \
                -e WEB_PATH=\"${CI_WEBPATH}\" \
-                -e DO_REGION="ams3" \
-                -e DO_BUCKET="lsio-ci" \
                -t ghcr.io/linuxserver/ci:latest \
                python3 test_build.py'''
        }
@@ -722,12 +714,6 @@ pipeline {
      }
      steps {
        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
          [
            $class: 'UsernamePasswordMultiBinding',
            credentialsId: 'Quay.io-Robot',
@@ -738,7 +724,7 @@ pipeline {
          retry(5) {
            sh '''#! /bin/bash
                  set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
@@ -758,17 +744,6 @@ pipeline {
                  done
               '''
          }
-          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
-                  docker rmi \
-                  ${DELETEIMAGE}:${META_TAG} \
-                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:development || :
-                  if [ -n "${SEMVER}" ]; then
-                    docker rmi ${DELETEIMAGE}:${SEMVER} || :
-                  fi
-                done
-             '''
        }
      }
    }
@@ -780,12 +755,6 @@ pipeline {
      }
      steps {
        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
          [
            $class: 'UsernamePasswordMultiBinding',
            credentialsId: 'Quay.io-Robot',
@@ -796,13 +765,11 @@ pipeline {
          retry(5) {
            sh '''#! /bin/bash
                  set -e
-                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
+                  echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin
                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                  if [ "${CI}" == "false" ]; then
-                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                  fi
@@ -810,49 +777,47 @@ pipeline {
                    docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-development
                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-development
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-development
                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                    if [ -n "${SEMVER}" ]; then
                      docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
                      docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                    fi
                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                    docker push ${MANIFESTIMAGE}:amd64-development
-                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm32v7-development
-                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                    docker push ${MANIFESTIMAGE}:arm64v8-development
                    docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                    if [ -n "${SEMVER}" ]; then
                      docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
                      docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                    fi
                    docker manifest push --purge ${MANIFESTIMAGE}:development || :
-                    docker manifest create ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm32v7-development ${MANIFESTIMAGE}:arm64v8-development
-                    docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm32v7-development --os linux --arch arm
+                    docker manifest create ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm64v8-development
                    docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm64v8-development --os linux --arch arm64 --variant v8
                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
+                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
+                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
                    if [ -n "${SEMVER}" ]; then
                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
-                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
+                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
                    fi
+                    token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
+                    digest=$(curl -s \
+                      --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+                      --header "Authorization: Bearer ${token}" \
+                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-development")
+                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
+                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-development || :
+                      docker manifest create ${MANIFESTIMAGE}:arm32v7-development ${MANIFESTIMAGE}:amd64-development
+                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-development
+                    fi
                    docker manifest push --purge ${MANIFESTIMAGE}:development
                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
@@ -862,29 +827,6 @@ pipeline {
                  done
               '''
          }
-          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
-                  docker rmi \
-                  ${DELETEIMAGE}:amd64-${META_TAG} \
-                  ${DELETEIMAGE}:amd64-development \
-                  ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
-                  ${DELETEIMAGE}:arm32v7-development \
-                  ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
-                  ${DELETEIMAGE}:arm64v8-development \
-                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
-                  if [ -n "${SEMVER}" ]; then
-                    docker rmi \
-                    ${DELETEIMAGE}:amd64-${SEMVER} \
-                    ${DELETEIMAGE}:arm32v7-${SEMVER} \
-                    ${DELETEIMAGE}:arm64v8-${SEMVER} || :
-                  fi
-                done
-                docker rmi \
-                ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
-                ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
-             '''
        }
      }
    }
@@ -918,49 +860,117 @@ pipeline {
              curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
      }
    }
-    // Use helper container to sync the current README on master to the dockerhub endpoint
-    stage('Sync-README') {
+    // Add protection to the release branch
+    stage('Github-Release-Branch-Protection') {
      when {
+        branch "development"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ]
-        ]) {
-          sh '''#! /bin/bash
-                set -e
-                TEMPDIR=$(mktemp -d)
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
-                docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH="${BRANCH_NAME}" -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest
-                docker pull ghcr.io/linuxserver/readme-sync
-                docker run --rm=true \
-                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
-                  -e DOCKERHUB_PASSWORD=$DOCKERPASS \
-                  -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
-                  -e DOCKER_REPOSITORY=${IMAGE} \
-                  -e GIT_BRANCH=master \
-                  -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
-                  ghcr.io/linuxserver/readme-sync bash -c 'node sync'
-                rm -Rf ${TEMPDIR} '''
-        }
+        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/development/protection \
+          -d $(jq -c .  << EOF
+            {
+              "required_status_checks": null,
+              "enforce_admins": false,
+              "required_pull_request_reviews": {
+                "dismiss_stale_reviews": false,
+                "require_code_owner_reviews": false,
+                "require_last_push_approval": false,
+                "required_approving_review_count": 1
+              },
+              "restrictions": null,
+              "required_linear_history": false,
+              "allow_force_pushes": false,
+              "allow_deletions": false,
+              "block_creations": false,
+              "required_conversation_resolution": true,
+              "lock_branch": false,
+              "allow_fork_syncing": false,
+              "required_signatures": false
+            }
+EOF
+          ) '''
      }
    }
    // If this is a Pull request send the CI link as a comment on it
    stage('Pull Request Comment') {
      when {
        not {environment name: 'CHANGE_ID', value: ''}
-        environment name: 'CI', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \
-        -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' '''
+        sh '''#! /bin/bash
+            # Function to retrieve JSON data from URL
+            get_json() {
+              local url="$1"
+              local response=$(curl -s "$url")
+              if [ $? -ne 0 ]; then
+                echo "Failed to retrieve JSON data from $url"
+                return 1
+              fi
+              local json=$(echo "$response" | jq .)
+              if [ $? -ne 0 ]; then
+                echo "Failed to parse JSON data from $url"
+                return 1
+              fi
+              echo "$json"
+            }
+
+            build_table() {
+              local data="$1"
+
+              # Get the keys in the JSON data
+              local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]')
+
+              # Check if keys are empty
+              if [ -z "$keys" ]; then
+                echo "JSON report data does not contain any keys or the report does not exist."
+                return 1
+              fi
+
+              # Build table header
+              local header="| Tag | Passed |\\n| --- | --- |\\n"
+
+              # Loop through the JSON data to build the table rows
+              local rows=""
+              for build in $keys; do
+                local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success")
+                if [ "$status" = "true" ]; then
+                  status="✅"
+                else
+                  status="❌"
+                fi
+                local row="| "$build" | "$status" |\\n"
+                rows="${rows}${row}"
+              done
+
+              local table="${header}${rows}"
+              local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g')
+              echo "$escaped_table"
+            }
+
+            if [[ "${CI}" = "true" ]]; then
+              # Retrieve JSON data from URL
+              data=$(get_json "$CI_JSON_URL")
+              # Create table from JSON data
+              table=$(build_table "$data")
+              echo -e "$table"
+
+              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
+                -H "Accept: application/vnd.github.v3+json" \
+                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
+                -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
+            else
+              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
+                -H "Accept: application/vnd.github.v3+json" \
+                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
+                -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
+            fi
+            '''
+
      }
    }
  }
@@ -986,6 +996,14 @@ pipeline {
      }
    }
    cleanup {
+      sh '''#! /bin/bash
+            echo "Performing docker system prune!!"
+            containers=$(docker ps -aq)
+            if [[ -n "${containers}" ]]; then
+              docker stop ${containers}
+            fi
+            docker system prune -af --volumes || :
+         '''
      cleanWs()
    }
  }
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
-<!-- DO NOT EDIT THIS FILE MANUALLY  -->
-<!-- Please read the https://github.com/linuxserver/docker-heimdall/blob/development/.github/CONTRIBUTING.md -->
-
+<!-- DO NOT EDIT THIS FILE MANUALLY -->
+<!-- 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!")
@@ -50,7 +49,7 @@ Why not use it as your browser start page? It even has the ability to include a

 ## Supported Architectures

-We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+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:development` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.

@@ -60,7 +59,7 @@ The architectures supported by this image are:
 | :----: | :----: | ---- |
 | x86-64 | ✅ | amd64-\<version tag\> |
 | arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf | ✅ | arm32v7-\<version tag\> |
+| armhf | ❌ | |

 ## Version Tags

@@ -70,6 +69,7 @@ This image provides various versions that are available via tags. Please read th
 | :----: | :----: |--- |
 | latest | ✅ | Stable Heimdall releases. |
 | development | ✅ | Latest commit from the github 2.x branch. |
+
 ## Application Setup

 Access the web gui at http://SERVERIP:PORT
@@ -81,13 +81,12 @@ This image now supports password protection through htpasswd. Run the following

 ## Usage

-Here are some example snippets to help you get started creating a container.
+To help you get started creating a container from this image you can either use docker-compose or the docker cli.

 ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))

 ```yaml
 ---
-version: "2.1"
 services:
  heimdall:
    image: lscr.io/linuxserver/heimdall:development
@@ -97,7 +96,7 @@ services:
      - PGID=1000
      - TZ=Etc/UTC
    volumes:
-      - /path/to/appdata/config:/config
+      - /path/to/heimdall/config:/config
    ports:
      - 80:80
      - 443:443
@@ -114,15 +113,14 @@ docker run -d \
  -e TZ=Etc/UTC \
  -p 80:80 \
  -p 443:443 \
-  -v /path/to/appdata/config:/config \
+  -v /path/to/heimdall/config:/config \
  --restart unless-stopped \
  lscr.io/linuxserver/heimdall:development
-
 ```

 ## Parameters

-Container images are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.
+Containers are configured using parameters passed at runtime (such as those above). These parameters are separated by a colon and indicate `<external>:<internal>` respectively. For example, `-p 8080:80` would expose port `80` from inside the container to be accessible from the host's IP on port `8080` outside the container.

 | Parameter | Function |
 | :----: | --- |
@@ -131,7 +129,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
-| `-v /config` | Contains all relevant configuration files. |
+| `-v /config` | Persistent config files |

 ## Environment variables from files (Docker secrets)

@@ -140,10 +138,10 @@ You can set any environment variable from a file by using a special prepend `FIL
 As an example:

 ```bash
-e FILE__PASSWORD=/run/secrets/mysecretpassword
+-e FILE__MYVAR=/run/secrets/mysecretvariable
 ```

-Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
+Will set the environment variable `MYVAR` based on the contents of the `/run/secrets/mysecretvariable` file.

 ## Umask for running applications

@@ -152,15 +150,20 @@ Keep in mind umask is not chmod it subtracts from permissions based on it's valu

 ## User / Group Identifiers

-When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
+When using volumes (`-v` flags), permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.

 Ensure any volume directories on the host are owned by the same user you specify and any permissions issues will vanish like magic.

-In this instance `PUID=1000` and `PGID=1000`, to find yours use `id user` as below:
+In this instance `PUID=1000` and `PGID=1000`, to find yours use `id your_user` as below:

 ```bash
-  $ id username
-    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
+id your_user
+```
+
+Example output:
+
+```text
+uid=1000(your_user) gid=1000(your_user) groups=1000(your_user)
 ```

 ## Docker Mods
@@ -171,53 +174,100 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to

 ## Support Info

-* Shell access whilst the container is running: `docker exec -it heimdall /bin/bash`
-* To monitor the logs of the container in realtime: `docker logs -f heimdall`
-* container version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' heimdall`
-* image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/heimdall:development`
+* Shell access whilst the container is running:
+
+    ```bash
+    docker exec -it heimdall /bin/bash
+    ```
+
+* To monitor the logs of the container in realtime:
+
+    ```bash
+    docker logs -f heimdall
+    ```
+
+* Container version number:
+
+    ```bash
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' heimdall
+    ```
+
+* Image version number:
+
+    ```bash
+    docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/heimdall:development
+    ```

 ## Updating Info

-Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (ie. nextcloud, plex), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.
+Most of our images are static, versioned, and require an image update and container recreation to update the app inside. With some exceptions (noted in the relevant readme.md), we do not recommend or support updating apps inside the container. Please consult the [Application Setup](#application-setup) section above to see if it is recommended for the image.

 Below are the instructions for updating containers:

 ### Via Docker Compose

-* Update all images: `docker-compose pull`
-  * or update a single image: `docker-compose pull heimdall`
-* Let compose update all containers as necessary: `docker-compose up -d`
-  * or update a single container: `docker-compose up -d heimdall`
-* You can also remove the old dangling images: `docker image prune`
+* Update images:
+    * All images:
+
+        ```bash
+        docker-compose pull
+        ```
+
+    * Single image:
+
+        ```bash
+        docker-compose pull heimdall
+        ```
+
+* Update containers:
+    * All containers:
+
+        ```bash
+        docker-compose up -d
+        ```
+
+    * Single container:
+
+        ```bash
+        docker-compose up -d heimdall
+        ```
+
+* You can also remove the old dangling images:
+
+    ```bash
+    docker image prune
+    ```

 ### Via Docker Run

-* Update the image: `docker pull lscr.io/linuxserver/heimdall:development`
-* Stop the running container: `docker stop heimdall`
-* Delete the container: `docker rm heimdall`
+* Update the image:
+
+    ```bash
+    docker pull lscr.io/linuxserver/heimdall:development
+    ```
+
+* Stop the running container:
+
+    ```bash
+    docker stop heimdall
+    ```
+
+* Delete the container:
+
+    ```bash
+    docker rm heimdall
+    ```
+
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
-* You can also remove the old dangling images: `docker image prune`
+* You can also remove the old dangling images:

-### Via Watchtower auto-updater (only use if you don't remember the original parameters)
-
-* Pull the latest image at its tag and replace it with the same env variables in one run:
-
-  ```bash
-  docker run --rm \
-  -v /var/run/docker.sock:/var/run/docker.sock \
-  containrrr/watchtower \
-  --run-once heimdall
-  ```
-
-* You can also remove the old dangling images: `docker image prune`
-
-**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
+    ```bash
+    docker image prune
+    ```

 ### Image Update Notifications - Diun (Docker Image Update Notifier)

-* We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.
+**tip**: We recommend [Diun](https://crazymax.dev/diun/) for update notifications. Other tools that automatically update containers unattended are not recommended or supported.

 ## Building locally

@@ -242,6 +292,9 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **23.12.23:** - Rebase to Alpine 3.19 with php 8.3.
+* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
+* **13.04.23:** - Move ssl.conf include to default.conf.
 * **20.01.23:** - Rebase to alpine 3.17 with php8.1.
 * **14.11.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).
 * **04.11.22:** - Build commits to upstream branch 2.x.
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -6,6 +6,7 @@ external_type: github_commit
 release_type: prerelease
 release_tag: development
 ls_branch: development
+build_armhf: false
 repo_vars:
  - EXT_GIT_BRANCH = '2.x'
  - EXT_USER = 'linuxserver'
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -1,227 +1,248 @@
 NAME                                VERSION                TYPE         
-alpine-baselayout                   3.4.0-r0               apk           
-alpine-baselayout-data              3.4.0-r0               apk           
+Hidden Input                        1, 0, 0, 0             dotnet        
+alpine-baselayout                   3.4.3-r2               apk           
+alpine-baselayout-data              3.4.3-r2               apk           
 alpine-keys                         2.4-r1                 apk           
-alpine-release                      3.17.3-r0              apk           
-apache2-utils                       2.4.57-r0              apk           
-apk-tools                           2.12.10-r1             apk           
-apr                                 1.7.2-r0               apk           
-apr-util                            1.6.3-r0               apk           
-argon2-libs                         20190702-r2            apk           
-barryvdh/laravel-ide-helper         v2.12.3                php-composer  
-barryvdh/reflection-docblock        v2.1.0                 php-composer  
-bash                                5.2.15-r0              apk           
-brick/math                          0.9.3                  php-composer  
-brotli-libs                         1.0.9-r9               apk           
-busybox                             1.35.0                 binary        
-busybox                             1.35.0-r29             apk           
-busybox-binsh                       1.35.0-r29             apk           
-ca-certificates                     20220614-r4            apk           
-ca-certificates-bundle              20220614-r4            apk           
-clue/stream-filter                  v1.6.0                 php-composer  
-composer/pcre                       3.1.0                  php-composer  
-coreutils                           9.1-r0                 apk           
-curl                                7.88.1-r1              apk           
+alpine-release                      3.19.1-r0              apk           
+apache2-utils                       2.4.58-r1              apk           
+apk-tools                           2.14.0-r5              apk           
+apr                                 1.7.4-r0               apk           
+apr-util                            1.6.3-r1               apk           
+argon2-libs                         20190702-r5            apk           
+aws/aws-crt-php                     v1.2.4                 php-composer  
+aws/aws-sdk-php                     3.299.1                php-composer  
+barryvdh/laravel-ide-helper         v2.15.1                php-composer  
+barryvdh/reflection-docblock        v2.1.1                 php-composer  
+bash                                5.2.21-r0              apk           
+brick/math                          0.11.0                 php-composer  
+brotli-libs                         1.1.0-r1               apk           
+busybox                             1.36.1-r15             apk           
+busybox-binsh                       1.36.1-r15             apk           
+c-ares                              1.24.0-r1              apk           
+ca-certificates                     20230506-r0            apk           
+ca-certificates-bundle              20230506-r0            apk           
+carbonphp/carbon-doctrine-types     2.1.0                  php-composer  
+clue/stream-filter                  v1.7.0                 php-composer  
+composer                            2.7.1                  binary        
+composer/class-map-generator        1.1.0                  php-composer  
+composer/pcre                       3.1.1                  php-composer  
+coreutils                           9.4-r2                 apk           
+coreutils-env                       9.4-r2                 apk           
+coreutils-fmt                       9.4-r2                 apk           
+coreutils-sha512sum                 9.4-r2                 apk           
+curl                                8.5.0-r0               apk           
 dflydev/dot-access-data             v3.0.2                 php-composer  
 doctrine/cache                      2.2.0                  php-composer  
-doctrine/dbal                       3.5.1                  php-composer  
-doctrine/deprecations               v1.0.0                 php-composer  
-doctrine/event-manager              1.2.0                  php-composer  
-doctrine/inflector                  2.0.6                  php-composer  
-doctrine/instantiator               1.4.1                  php-composer  
-doctrine/lexer                      1.2.3                  php-composer  
-dragonmantank/cron-expression       v3.3.2                 php-composer  
-egulias/email-validator             2.1.25                 php-composer  
-facade/flare-client-php             1.10.0                 php-composer  
-facade/ignition                     2.17.6                 php-composer  
-facade/ignition-contracts           1.0.2                  php-composer  
-fideloper/proxy                     4.4.2                  php-composer  
-filp/whoops                         2.14.6                 php-composer  
-fzaninotto/faker                    v1.9.2                 php-composer  
-git                                 2.38.4-r1              apk           
-graham-campbell/bounded-cache       v1.3.0                 php-composer  
-graham-campbell/github              v10.6.0                php-composer  
-graham-campbell/manager             v4.7.0                 php-composer  
-graham-campbell/result-type         v1.1.0                 php-composer  
-guzzlehttp/guzzle                   7.5.0                  php-composer  
-guzzlehttp/promises                 1.5.2                  php-composer  
-guzzlehttp/psr7                     2.4.3                  php-composer  
+doctrine/dbal                       3.8.2                  php-composer  
+doctrine/deprecations               1.1.3                  php-composer  
+doctrine/event-manager              2.0.0                  php-composer  
+doctrine/inflector                  2.0.9                  php-composer  
+doctrine/instantiator               2.0.0                  php-composer  
+doctrine/lexer                      3.0.1                  php-composer  
+dragonmantank/cron-expression       v3.3.3                 php-composer  
+egulias/email-validator             4.0.2                  php-composer  
+fakerphp/faker                      v1.23.1                php-composer  
+filp/whoops                         2.15.4                 php-composer  
+fruitcake/php-cors                  v1.3.0                 php-composer  
+git                                 2.43.0-r0              apk           
+graham-campbell/bounded-cache       v2.2.0                 php-composer  
+graham-campbell/github              v12.4.0                php-composer  
+graham-campbell/manager             v5.1.0                 php-composer  
+graham-campbell/result-type         v1.1.2                 php-composer  
+guzzlehttp/guzzle                   7.8.1                  php-composer  
+guzzlehttp/promises                 2.0.2                  php-composer  
+guzzlehttp/psr7                     2.6.2                  php-composer  
+guzzlehttp/uri-template             v1.0.3                 php-composer  
 hamcrest/hamcrest-php               v2.0.1                 php-composer  
-icu-data-en                         72.1-r1                apk           
-icu-libs                            72.1-r1                apk           
-jq                                  1.6-r2                 apk           
-knplabs/github-api                  v3.6.0                 php-composer  
-laravel/framework                   v8.83.26               php-composer  
-laravel/serializable-closure        v1.2.2                 php-composer  
-laravel/tinker                      v2.7.3                 php-composer  
-laravel/ui                          v3.4.6                 php-composer  
-laravelcollective/html              v6.3.0                 php-composer  
-league/commonmark                   2.3.7                  php-composer  
-league/config                       v1.1.1                 php-composer  
-league/flysystem                    1.1.10                 php-composer  
-league/mime-type-detection          1.11.0                 php-composer  
-libacl                              2.3.1-r1               apk           
-libattr                             2.5.1-r2               apk           
-libbsd                              0.11.7-r0              apk           
-libbz2                              1.0.8-r4               apk           
-libc-utils                          0.7.2-r3               apk           
-libcrypto3                          3.0.8-r3               apk           
-libcurl                             8.0.1-r0               apk           
-libedit                             20221030.3.1-r0        apk           
-libexpat                            2.5.0-r0               apk           
-libgcc                              12.2.1_git20220924-r4  apk           
-libintl                             0.21.1-r1              apk           
-libmd                               1.0.4-r0               apk           
-libpq                               15.2-r0                apk           
-libproc                             3.3.17-r2              apk           
-libssl3                             3.0.8-r3               apk           
-libstdc++                           12.2.1_git20220924-r4  apk           
-libuuid                             2.38.1-r1              apk           
-libxml2                             2.10.4-r0              apk           
-libzip                              1.9.2-r2               apk           
-linux-pam                           1.5.2-r1               apk           
-logrotate                           3.20.1-r3              apk           
-mockery/mockery                     1.5.1                  php-composer  
-monolog/monolog                     2.8.0                  php-composer  
-musl                                1.2.3-r4               apk           
-musl-utils                          1.2.3-r4               apk           
-myclabs/deep-copy                   1.11.0                 php-composer  
-nano                                7.0-r0                 apk           
-ncurses-libs                        6.3_p20221119-r0       apk           
-ncurses-terminfo-base               6.3_p20221119-r0       apk           
-nesbot/carbon                       2.63.0                 php-composer  
-netcat-openbsd                      1.130-r4               apk           
-nette/schema                        v1.2.3                 php-composer  
-nette/utils                         v3.2.8                 php-composer  
-nghttp2-libs                        1.51.0-r0              apk           
-nginx                               1.22.1-r0              apk           
-nikic/php-parser                    v4.15.2                php-composer  
-nunomaduro/collision                v5.11.0                php-composer  
-oniguruma                           6.9.8-r0               apk           
-openssl                             3.0.8-r3               apk           
-opis/closure                        3.6.3                  php-composer  
-pcre                                8.45-r2                apk           
-pcre2                               10.42-r0               apk           
+hiredis                             1.2.0-r0               apk           
+icu-data-en                         74.1-r0                apk           
+icu-libs                            74.1-r0                apk           
+jq                                  1.7.1-r0               apk           
+knplabs/github-api                  v3.13.0                php-composer  
+laravel/framework                   v10.44.0               php-composer  
+laravel/prompts                     v0.1.15                php-composer  
+laravel/serializable-closure        v1.3.3                 php-composer  
+laravel/tinker                      v2.9.0                 php-composer  
+laravel/ui                          v4.4.0                 php-composer  
+laravelcollective/html              v6.4.1                 php-composer  
+lcobucci/jwt                        5.2.0                  php-composer  
+league/commonmark                   2.4.2                  php-composer  
+league/config                       v1.2.0                 php-composer  
+league/flysystem                    3.24.0                 php-composer  
+league/flysystem-aws-s3-v3          3.24.0                 php-composer  
+league/flysystem-local              3.23.1                 php-composer  
+league/mime-type-detection          1.15.0                 php-composer  
+libacl                              2.3.1-r4               apk           
+libattr                             2.5.1-r5               apk           
+libbsd                              0.11.7-r3              apk           
+libbz2                              1.0.8-r6               apk           
+libc-utils                          0.7.2-r5               apk           
+libcrypto3                          3.1.4-r5               apk           
+libcurl                             8.5.0-r0               apk           
+libedit                             20230828.3.1-r3        apk           
+libexpat                            2.6.0-r0               apk           
+libgcc                              13.2.1_git20231014-r0  apk           
+libidn2                             2.3.4-r4               apk           
+libintl                             0.22.3-r0              apk           
+libmd                               1.1.0-r0               apk           
+libncursesw                         6.4_p20231125-r0       apk           
+libpq                               16.2-r0                apk           
+libproc2                            4.0.4-r0               apk           
+libssl3                             3.1.4-r5               apk           
+libstdc++                           13.2.1_git20231014-r0  apk           
+libunistring                        1.1-r2                 apk           
+libuuid                             2.39.3-r0              apk           
+libxml2                             2.11.7-r0              apk           
+libzip                              1.10.1-r0              apk           
+linux-pam                           1.5.3-r7               apk           
+logrotate                           3.21.0-r1              apk           
+mockery/mockery                     1.6.7                  php-composer  
+monolog/monolog                     3.5.0                  php-composer  
+mtdowling/jmespath.php              2.7.0                  php-composer  
+musl                                1.2.4_git20230717-r4   apk           
+musl-utils                          1.2.4_git20230717-r4   apk           
+myclabs/deep-copy                   1.11.1                 php-composer  
+nano                                7.2-r1                 apk           
+ncurses-terminfo-base               6.4_p20231125-r0       apk           
+nesbot/carbon                       2.72.3                 php-composer  
+netcat-openbsd                      1.226-r0               apk           
+nette/schema                        v1.3.0                 php-composer  
+nette/utils                         v4.0.4                 php-composer  
+nghttp2-libs                        1.58.0-r0              apk           
+nginx                               1.24.0-r15             apk           
+nikic/php-parser                    v5.0.0                 php-composer  
+nunomaduro/collision                v6.4.0                 php-composer  
+nunomaduro/termwind                 v1.15.1                php-composer  
+oniguruma                           6.9.9-r0               apk           
+openssl                             3.1.4-r5               apk           
+pcre                                8.45-r3                apk           
+pcre2                               10.42-r2               apk           
 phar-io/manifest                    2.0.3                  php-composer  
 phar-io/version                     3.2.1                  php-composer  
-php-cli                             8.1.17                 binary        
-php-fpm                             8.1.17                 binary        
-php-http/cache-plugin               1.7.5                  php-composer  
-php-http/client-common              2.6.0                  php-composer  
-php-http/discovery                  1.14.3                 php-composer  
-php-http/httplug                    2.3.0                  php-composer  
-php-http/message                    1.13.0                 php-composer  
-php-http/message-factory            v1.0.2                 php-composer  
-php-http/multipart-stream-builder   1.2.0                  php-composer  
-php-http/promise                    1.1.0                  php-composer  
-php81                               8.1.17-r0              apk           
-php81-common                        8.1.18-r0              apk           
-php81-ctype                         8.1.18-r0              apk           
-php81-curl                          8.1.18-r0              apk           
-php81-fileinfo                      8.1.17-r0              apk           
-php81-fpm                           8.1.17-r0              apk           
-php81-intl                          8.1.18-r0              apk           
-php81-mbstring                      8.1.17-r0              apk           
-php81-mysqlnd                       8.1.18-r0              apk           
-php81-openssl                       8.1.18-r0              apk           
-php81-pdo                           8.1.18-r0              apk           
-php81-pdo_mysql                     8.1.18-r0              apk           
-php81-pdo_pgsql                     8.1.18-r0              apk           
-php81-pdo_sqlite                    8.1.18-r0              apk           
-php81-session                       8.1.17-r0              apk           
-php81-simplexml                     8.1.17-r0              apk           
-php81-tokenizer                     8.1.18-r0              apk           
-php81-xml                           8.1.17-r0              apk           
-php81-xmlwriter                     8.1.17-r0              apk           
-php81-zip                           8.1.18-r0              apk           
+php-http/cache-plugin               1.8.1                  php-composer  
+php-http/client-common              2.7.1                  php-composer  
+php-http/discovery                  1.19.2                 php-composer  
+php-http/httplug                    2.4.0                  php-composer  
+php-http/message                    1.16.0                 php-composer  
+php-http/message-factory            1.1.0                  php-composer  
+php-http/multipart-stream-builder   1.3.0                  php-composer  
+php-http/promise                    1.3.0                  php-composer  
+php83                               8.3.3-r0               apk           
+php83-common                        8.3.3-r0               apk           
+php83-ctype                         8.3.3-r0               apk           
+php83-curl                          8.3.3-r0               apk           
+php83-dom                           8.3.3-r0               apk           
+php83-fileinfo                      8.3.3-r0               apk           
+php83-fpm                           8.3.3-r0               apk           
+php83-iconv                         8.3.3-r0               apk           
+php83-intl                          8.3.3-r0               apk           
+php83-mbstring                      8.3.3-r0               apk           
+php83-mysqlnd                       8.3.3-r0               apk           
+php83-openssl                       8.3.3-r0               apk           
+php83-pdo                           8.3.3-r0               apk           
+php83-pdo_mysql                     8.3.3-r0               apk           
+php83-pdo_pgsql                     8.3.3-r0               apk           
+php83-pdo_sqlite                    8.3.3-r0               apk           
+php83-phar                          8.3.3-r0               apk           
+php83-session                       8.3.3-r0               apk           
+php83-simplexml                     8.3.3-r0               apk           
+php83-tokenizer                     8.3.3-r0               apk           
+php83-xml                           8.3.3-r0               apk           
+php83-xmlwriter                     8.3.3-r0               apk           
+php83-zip                           8.3.3-r0               apk           
 phpdocumentor/reflection-common     2.2.0                  php-composer  
-phpdocumentor/type-resolver         1.6.2                  php-composer  
-phpoption/phpoption                 1.9.0                  php-composer  
-phpunit/php-code-coverage           9.2.19                 php-composer  
+phpdocumentor/type-resolver         1.8.0                  php-composer  
+phpoption/phpoption                 1.9.2                  php-composer  
+phpstan/phpdoc-parser               1.25.0                 php-composer  
+phpunit/php-code-coverage           9.2.30                 php-composer  
 phpunit/php-file-iterator           3.0.6                  php-composer  
 phpunit/php-invoker                 3.1.1                  php-composer  
 phpunit/php-text-template           2.0.4                  php-composer  
 phpunit/php-timer                   5.0.3                  php-composer  
-phpunit/phpunit                     9.5.26                 php-composer  
-popt                                1.19-r0                apk           
-procps                              3.3.17-r2              apk           
-psr/cache                           1.0.1                  php-composer  
-psr/container                       1.1.2                  php-composer  
+phpunit/phpunit                     9.6.16                 php-composer  
+popt                                1.19-r3                apk           
+procps-ng                           4.0.4-r0               apk           
+psr/cache                           3.0.0                  php-composer  
+psr/clock                           1.0.0                  php-composer  
+psr/container                       2.0.2                  php-composer  
 psr/event-dispatcher                1.0.0                  php-composer  
-psr/http-client                     1.0.1                  php-composer  
-psr/http-factory                    1.0.1                  php-composer  
-psr/http-message                    1.0.1                  php-composer  
-psr/log                             1.1.4                  php-composer  
-psr/simple-cache                    1.0.1                  php-composer  
-psy/psysh                           v0.11.9                php-composer  
+psr/http-client                     1.0.3                  php-composer  
+psr/http-factory                    1.0.2                  php-composer  
+psr/http-message                    2.0                    php-composer  
+psr/log                             3.0.0                  php-composer  
+psr/simple-cache                    3.0.0                  php-composer  
+psy/psysh                           v0.12.0                php-composer  
 ralouphie/getallheaders             3.0.3                  php-composer  
-ramsey/collection                   1.2.2                  php-composer  
-ramsey/uuid                         4.2.3                  php-composer  
-readline                            8.2.0-r0               apk           
-scanelf                             1.3.5-r1               apk           
+ramsey/collection                   2.0.0                  php-composer  
+ramsey/uuid                         4.7.5                  php-composer  
+readline                            8.2.1-r2               apk           
+scanelf                             1.3.7-r2               apk           
 sebastian/cli-parser                1.0.1                  php-composer  
 sebastian/code-unit                 1.0.8                  php-composer  
 sebastian/code-unit-reverse-lookup  2.0.3                  php-composer  
 sebastian/comparator                4.0.8                  php-composer  
-sebastian/complexity                2.0.2                  php-composer  
-sebastian/diff                      4.0.4                  php-composer  
-sebastian/environment               5.1.4                  php-composer  
+sebastian/complexity                2.0.3                  php-composer  
+sebastian/diff                      4.0.5                  php-composer  
+sebastian/environment               5.1.5                  php-composer  
 sebastian/exporter                  4.0.5                  php-composer  
-sebastian/global-state              5.0.5                  php-composer  
-sebastian/lines-of-code             1.0.3                  php-composer  
+sebastian/global-state              5.0.6                  php-composer  
+sebastian/lines-of-code             1.0.4                  php-composer  
 sebastian/object-enumerator         4.0.4                  php-composer  
 sebastian/object-reflector          2.0.4                  php-composer  
-sebastian/recursion-context         4.0.4                  php-composer  
+sebastian/recursion-context         4.0.5                  php-composer  
 sebastian/resource-operations       3.0.3                  php-composer  
-sebastian/type                      3.2.0                  php-composer  
+sebastian/type                      3.2.1                  php-composer  
 sebastian/version                   3.0.2                  php-composer  
-shadow                              4.13-r0                apk           
-skalibs                             2.12.0.1-r0            apk           
-sqlite-libs                         3.40.1-r0              apk           
-squizlabs/php_codesniffer           3.7.1                  php-composer  
-ssl_client                          1.35.0-r29             apk           
-swiftmailer/swiftmailer             v6.3.0                 php-composer  
-symfony/cache                       v5.4.15                php-composer  
-symfony/cache-contracts             v2.5.2                 php-composer  
-symfony/console                     v5.4.15                php-composer  
-symfony/css-selector                v5.4.11                php-composer  
-symfony/deprecation-contracts       v2.5.2                 php-composer  
-symfony/error-handler               v5.4.15                php-composer  
-symfony/event-dispatcher            v5.4.9                 php-composer  
-symfony/event-dispatcher-contracts  v2.5.2                 php-composer  
-symfony/finder                      v5.4.11                php-composer  
-symfony/http-foundation             v5.4.15                php-composer  
-symfony/http-kernel                 v5.4.15                php-composer  
-symfony/mime                        v5.4.14                php-composer  
-symfony/options-resolver            v5.4.11                php-composer  
-symfony/polyfill-ctype              v1.27.0                php-composer  
-symfony/polyfill-iconv              v1.27.0                php-composer  
-symfony/polyfill-intl-grapheme      v1.27.0                php-composer  
-symfony/polyfill-intl-idn           v1.27.0                php-composer  
-symfony/polyfill-intl-normalizer    v1.27.0                php-composer  
-symfony/polyfill-mbstring           v1.27.0                php-composer  
-symfony/polyfill-php72              v1.27.0                php-composer  
-symfony/polyfill-php73              v1.27.0                php-composer  
-symfony/polyfill-php80              v1.27.0                php-composer  
-symfony/polyfill-php81              v1.27.0                php-composer  
-symfony/process                     v5.4.11                php-composer  
-symfony/routing                     v5.4.15                php-composer  
-symfony/service-contracts           v2.5.2                 php-composer  
-symfony/string                      v5.4.15                php-composer  
+shadow                              4.14.2-r0              apk           
+skalibs                             2.14.0.1-r0            apk           
+spatie/backtrace                    1.5.3                  php-composer  
+spatie/flare-client-php             1.4.4                  php-composer  
+spatie/ignition                     1.12.0                 php-composer  
+spatie/laravel-ignition             2.4.2                  php-composer  
+sqlite-libs                         3.44.2-r0              apk           
+squizlabs/php_codesniffer           3.9.0                  php-composer  
+ssl_client                          1.36.1-r15             apk           
+symfony/cache                       v6.4.3                 php-composer  
+symfony/cache-contracts             v3.4.0                 php-composer  
+symfony/console                     v6.4.3                 php-composer  
+symfony/css-selector                v7.0.3                 php-composer  
+symfony/deprecation-contracts       v3.4.0                 php-composer  
+symfony/error-handler               v6.4.3                 php-composer  
+symfony/event-dispatcher            v7.0.3                 php-composer  
+symfony/event-dispatcher-contracts  v3.4.0                 php-composer  
+symfony/finder                      v6.4.0                 php-composer  
+symfony/http-foundation             v6.4.3                 php-composer  
+symfony/http-kernel                 v6.4.3                 php-composer  
+symfony/mailer                      v6.4.3                 php-composer  
+symfony/mime                        v6.4.3                 php-composer  
+symfony/options-resolver            v7.0.0                 php-composer  
+symfony/polyfill-ctype              v1.29.0                php-composer  
+symfony/polyfill-intl-grapheme      v1.29.0                php-composer  
+symfony/polyfill-intl-idn           v1.29.0                php-composer  
+symfony/polyfill-intl-normalizer    v1.29.0                php-composer  
+symfony/polyfill-mbstring           v1.29.0                php-composer  
+symfony/polyfill-php72              v1.29.0                php-composer  
+symfony/polyfill-php80              v1.29.0                php-composer  
+symfony/polyfill-php83              v1.29.0                php-composer  
+symfony/polyfill-uuid               v1.29.0                php-composer  
+symfony/process                     v6.4.3                 php-composer  
+symfony/routing                     v6.4.3                 php-composer  
+symfony/service-contracts           v3.4.1                 php-composer  
+symfony/string                      v7.0.3                 php-composer  
 symfony/thanks                      v1.2.10                php-composer  
-symfony/translation                 v5.4.14                php-composer  
-symfony/translation-contracts       v2.5.2                 php-composer  
-symfony/var-dumper                  v5.4.14                php-composer  
-symfony/var-exporter                v5.4.10                php-composer  
-symfony/yaml                        v5.4.14                php-composer  
-theseer/tokenizer                   1.2.1                  php-composer  
-tijsverkoyen/css-to-inline-styles   2.2.5                  php-composer  
-tzdata                              2023c-r0               apk           
-utmps-libs                          0.1.2.0-r1             apk           
-vlucas/phpdotenv                    v5.5.0                 php-composer  
-voku/portable-ascii                 1.6.1                  php-composer  
+symfony/translation                 v6.4.3                 php-composer  
+symfony/translation-contracts       v3.4.1                 php-composer  
+symfony/uid                         v6.4.3                 php-composer  
+symfony/var-dumper                  v6.4.3                 php-composer  
+symfony/var-exporter                v7.0.3                 php-composer  
+symfony/yaml                        v6.4.3                 php-composer  
+theseer/tokenizer                   1.2.2                  php-composer  
+tijsverkoyen/css-to-inline-styles   v2.2.7                 php-composer  
+tzdata                              2024a-r0               apk           
+utmps-libs                          0.1.2.2-r0             apk           
+vlucas/phpdotenv                    v5.6.0                 php-composer  
+voku/portable-ascii                 2.0.1                  php-composer  
 webmozart/assert                    1.11.0                 php-composer  
-xz                                  5.2.9-r0               apk           
-xz-libs                             5.2.9-r0               apk           
-zlib                                1.2.13-r0              apk           
-zstd-libs                           1.5.5-r0               apk           
+xz-libs                             5.4.5-r0               apk           
+zlib                                1.3.1-r0               apk           
+zstd-libs                           1.5.5-r8               apk           
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -16,7 +16,6 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
 available_architectures:
  - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-  - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}

 # development version
 development_versions: true
@@ -29,7 +28,7 @@ common_param_env_vars_enabled: true
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Contains all relevant configuration files." }
+  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }
 param_usage_include_ports: true
 param_ports:
  - { external_port: "80", internal_port: "80", port_desc: "http gui" }
@@ -59,6 +58,9 @@ app_setup_block: |

 # changelog
 changelogs:
+  - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."}
+  - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." }
+  - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
  - { 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." }
--- a/root/defaults/nginx/site-confs/default.conf.sample
+++ b/root/defaults/nginx/site-confs/default.conf.sample
@@ -1,4 +1,4 @@
-## Version 2022/11/14 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample

 server {
    listen 80 default_server;
@@ -9,6 +9,8 @@ server {

    server_name _;

+    include /config/nginx/ssl.conf;
+
    root /app/www/public;
    index index.html index.htm index.php;

--- a/root/migrations/02-default-location
+++ b/root/migrations/02-default-location
@@ -4,7 +4,7 @@ DEFAULT_CONF="/config/nginx/site-confs/default.conf"
 OLD_ROOT="root /var/www/localhost/heimdall/public;"
 NEW_ROOT="root /app/www/public;"

-if grep -q "${OLD_ROOT}" "${DEFAULT_CONF}" 2>/dev/null; then
+if [[ -f "${DEFAULT_CONF}" ]] && grep -q "${OLD_ROOT}" "${DEFAULT_CONF}" 2>/dev/null; then
    echo "updating root in ${DEFAULT_CONF}"
    sed -i "s|${OLD_ROOT}|${NEW_ROOT}|" "${DEFAULT_CONF}"
 fi
Author	SHA1	Message	Date
LinuxServer-CI	86015b2bb6	Bot Updating Templated Files	2024-02-23 18:32:34 +00:00
LinuxServer-CI	9d09f09b65	Bot Updating Templated Files	2024-02-23 18:29:08 +00:00
LinuxServer-CI	3952031cc4	Bot Updating Package Versions	2024-02-17 15:45:06 +00:00
aptalca	65032223b6	Merge pull request #146 from linuxserver/feature-add_dom_php_extension Add dom php extension to dev	2024-02-17 10:41:06 -05:00
Chris Hunt	c7475c8fe6	Add dom php extension to dev	2024-02-17 14:46:08 +00:00
LinuxServer-CI	181d9c4aed	Bot Updating Package Versions	2024-02-17 08:47:18 +00:00
LinuxServer-CI	51ffe0c841	Bot Updating Package Versions	2024-02-16 21:47:16 +00:00
LinuxServer-CI	e04a704803	Bot Updating Package Versions	2024-02-16 18:30:58 +00:00
LinuxServer-CI	08127222fa	Bot Updating Package Versions	2024-02-12 19:46:57 +00:00
LinuxServer-CI	0d894f8ca8	Bot Updating Package Versions	2024-02-09 18:31:07 +00:00
LinuxServer-CI	6ff1368f5f	Bot Updating Package Versions	2024-02-02 18:29:58 +00:00
LinuxServer-CI	65c299b32f	Bot Updating Package Versions	2024-01-26 16:42:34 +00:00
LinuxServer-CI	6aa0b5611d	Bot Updating Templated Files	2024-01-26 16:39:55 +00:00
Eric Nemchik	fc295cdcad	Merge pull request #141 from linuxserver/3.19-development Rebase to Alpine 3.19	2024-01-26 10:37:56 -06:00
LinuxServer-CI	d9800ee920	Bot Updating Package Versions	2024-01-19 18:33:34 +00:00
LinuxServer-CI	5fbe7b8c94	Bot Updating Package Versions	2024-01-12 18:39:53 +00:00
LinuxServer-CI	450b8c49ae	Bot Updating Templated Files	2024-01-12 18:36:21 +00:00
LinuxServer-CI	d0c3c7fb32	Bot Updating Templated Files	2024-01-12 18:33:53 +00:00
LinuxServer-CI	18594c2e33	Bot Updating Package Versions	2024-01-05 18:30:38 +00:00
Eric Nemchik	27b68856c7	Rebase to Alpine 3.19 Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-12-23 19:20:34 -06:00
LinuxServer-CI	9905ef8a45	Bot Updating Package Versions	2023-12-22 18:29:20 +00:00
LinuxServer-CI	157c18a81a	Bot Updating Package Versions	2023-12-15 18:31:10 +00:00
LinuxServer-CI	80ed370549	Bot Updating Package Versions	2023-12-08 18:30:20 +00:00
LinuxServer-CI	5544a0e7dd	Bot Updating Package Versions	2023-12-01 18:30:22 +00:00
Eric Nemchik	74f43c96f6	Merge pull request #139 from linuxserver/quiet-migration-development only run migration if conf exists	2023-11-29 08:31:03 -06:00
Eric Nemchik	6cb41d570e	only run migration if conf exists redirect stderr to /dev/null Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-11-25 10:51:48 -06:00
LinuxServer-CI	dc1f719285	Bot Updating Package Versions	2023-11-24 18:30:38 +00:00
LinuxServer-CI	2a6b03eca7	Bot Updating Package Versions	2023-11-17 18:33:13 +00:00
LinuxServer-CI	5365f6181d	Bot Updating Templated Files	2023-11-17 18:30:55 +00:00
LinuxServer-CI	c91ac478c9	Bot Updating Package Versions	2023-11-10 18:29:24 +00:00
LinuxServer-CI	369ba1c41b	Bot Updating Package Versions	2023-10-27 18:29:08 +00:00
LinuxServer-CI	88e7e1df09	Bot Updating Package Versions	2023-10-20 18:29:37 +00:00
LinuxServer-CI	a694621f78	Bot Updating Templated Files	2023-10-13 18:31:24 +00:00
LinuxServer-CI	0a0c8862f6	Bot Updating Package Versions	2023-10-06 18:41:35 +00:00
LinuxServer-CI	649f2b09a7	Bot Updating Templated Files	2023-10-06 18:35:50 +00:00
LinuxServer-CI	1ab60fda12	Bot Updating Templated Files	2023-10-06 18:29:57 +00:00
LinuxServer-CI	67b8da2a27	Bot Updating Package Versions	2023-09-29 18:30:15 +00:00
LinuxServer-CI	9da87dc8cf	Bot Updating Package Versions	2023-09-22 18:29:33 +00:00
LinuxServer-CI	1de91cfbd0	Bot Updating Package Versions	2023-09-08 18:28:47 +00:00
LinuxServer-CI	19c0db5c97	Bot Updating Package Versions	2023-09-01 18:28:39 +00:00
LinuxServer-CI	5498349626	Bot Updating Package Versions	2023-08-18 18:27:55 +00:00
LinuxServer-CI	eabd8a6738	Bot Updating Package Versions	2023-08-11 18:28:36 +00:00
LinuxServer-CI	82f1f4d934	Bot Updating Package Versions	2023-08-04 18:28:41 +00:00
LinuxServer-CI	7237d6ca9a	Bot Updating Package Versions	2023-07-28 18:28:17 +00:00
LinuxServer-CI	2275a8fb64	Bot Updating Package Versions	2023-07-21 18:29:51 +00:00
LinuxServer-CI	d545593107	Bot Updating Package Versions	2023-07-14 18:33:53 +00:00
LinuxServer-CI	34f7492c97	Bot Updating Package Versions	2023-07-07 18:34:07 +00:00
LinuxServer-CI	134b3e9533	Bot Updating Templated Files	2023-07-07 18:31:48 +00:00
LinuxServer-CI	8217bd55ea	Bot Updating Package Versions	2023-06-23 18:33:08 +00:00
LinuxServer-CI	1761816c42	Bot Updating Package Versions	2023-06-16 18:28:50 +00:00
LinuxServer-CI	ab5fc6b23d	Bot Updating Package Versions	2023-06-09 18:28:46 +00:00
LinuxServer-CI	f9d2fca42c	Bot Updating Package Versions	2023-06-07 12:40:54 +00:00
Eric Nemchik	fbe856fab3	Merge pull request #131 from linuxserver/3.18-development Rebase to Alpine 3.18, deprecate armhf	2023-06-07 07:38:48 -05:00
LinuxServer-CI	5a251cd21c	Bot Updating Package Versions	2023-06-02 18:29:27 +00:00
Eric Nemchik	19e3093840	Rebase to Alpine 3.18, deprecate armhf Signed-off-by: Eric Nemchik <eric@nemchik.com>	2023-05-31 17:46:44 +00:00
LinuxServer-CI	3e5d65217a	Bot Updating Package Versions	2023-05-26 08:48:38 +00:00
LinuxServer-CI	1e5c88de48	Bot Updating Templated Files	2023-05-26 08:46:11 +00:00
LinuxServer-CI	44612aa569	Bot Updating Package Versions	2023-05-19 18:29:53 +00:00
LinuxServer-CI	8706d29fe0	Bot Updating Package Versions	2023-05-16 14:46:34 +00:00
LinuxServer-CI	136dbe61bf	Bot Updating Package Versions	2023-05-12 18:28:08 +00:00
LinuxServer-CI	5977b7440e	Bot Updating Package Versions	2023-04-28 20:32:24 +02:00
LinuxServer-CI	d04a852a8d	Bot Updating Templated Files	2023-04-28 20:29:58 +02:00
LinuxServer-CI	a636e8534c	Bot Updating Templated Files	2023-04-28 20:28:24 +02:00
LinuxServer-CI	c5693232f4	Bot Updating Package Versions	2023-04-21 13:30:18 -05:00
LinuxServer-CI	6d7fad2d98	Bot Updating Package Versions	2023-04-18 16:13:45 +02:00
Eric Nemchik	204bad5de9	Merge pull request #126 from linuxserver/move-ssl-include-dev Move ssl.conf include to default.conf	2023-04-18 09:07:59 -05:00
Eric Nemchik	c4ab19e354	Move ssl.conf include to default.conf	2023-04-13 13:38:47 -05:00