Bot Updating Package Versions

Add opcache and clean up default site conf

.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

.github/workflows/external_trigger.yml

@@ -7,7 +7,7 @@ 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'

.github/workflows/external_trigger_scheduler.yml

@@ -9,7 +9,7 @@ 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'
 

.github/workflows/package_trigger.yml

@@ -7,7 +7,7 @@ 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'

.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'
 

Dockerfile

@@ -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,20 +14,22 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 
 RUN \
   echo "**** install runtime packages ****" && \
-  apk add --no-cache --upgrade \
+  apk add --no-cache \
-    php81-ctype \
+    php83-dom \
-    php81-curl \
+    php83-intl \
-    php81-intl \
+    php83-opcache \
-    php81-pdo_pgsql \
+    php83-pdo_mysql \
-    php81-pdo_sqlite \
+    php83-pdo_pgsql \
-    php81-pdo_mysql \
+    php83-pdo_sqlite \
-    php81-tokenizer \
+    php83-tokenizer && \
-    php81-zip && \
   echo "**** configure nginx ****" && \
   echo 'fastcgi_param  PHP_AUTH_USER      $remote_user; # Heimdall user authorization' >> \
     /etc/nginx/fastcgi_params && \
   echo 'fastcgi_param  PHP_AUTH_PW        $http_authorization; # Heimdall user authorization' >> \
     /etc/nginx/fastcgi_params && \
+  echo "**** configure php opcache ****" && \
+  echo 'opcache.validate_timestamps=0' >> \
+    /etc/php83/conf.d/00_opcache.ini && \
   echo "**** install heimdall ****" && \
   mkdir -p \
     /heimdall && \

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,20 +14,22 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 
 RUN \
   echo "**** install runtime packages ****" && \
-  apk add --no-cache --upgrade \
+  apk add --no-cache \
-    php81-ctype \
+    php83-dom \
-    php81-curl \
+    php83-intl \
-    php81-intl \
+    php83-opcache \
-    php81-pdo_pgsql \
+    php83-pdo_mysql \
-    php81-pdo_sqlite \
+    php83-pdo_pgsql \
-    php81-pdo_mysql \
+    php83-pdo_sqlite \
-    php81-tokenizer \
+    php83-tokenizer && \
-    php81-zip && \
   echo "**** configure nginx ****" && \
   echo 'fastcgi_param  PHP_AUTH_USER      $remote_user; # Heimdall user authorization' >> \
     /etc/nginx/fastcgi_params && \
   echo 'fastcgi_param  PHP_AUTH_PW        $http_authorization; # Heimdall user authorization' >> \
     /etc/nginx/fastcgi_params && \
+  echo "**** configure php opcache ****" && \
+  echo 'opcache.validate_timestamps=0' >> \
+    /etc/php83/conf.d/00_opcache.ini && \
   echo "**** install heimdall ****" && \
   mkdir -p \
     /heimdall && \

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

Jenkinsfile

@@ -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'
@@ -62,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' ''',
@@ -131,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+)/
@@ -149,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}")
@@ -173,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
           }
@@ -196,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
           }
@@ -219,7 +224,7 @@ 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 + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm32v7-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
+            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 + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           }
@@ -250,9 +255,11 @@ pipeline {
                   -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 "\
+                  ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
-                    apk add --no-cache py3-pip && \
+                    apk add --no-cache python3 && \
-                    pip install s3cmd && \
+                    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" || :'''
         }
       }
@@ -281,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}
@@ -290,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}"
@@ -305,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}
@@ -326,26 +335,34 @@ 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
+              mkdir -p ${TEMPDIR}/docs
-              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/gitbook/docker-documentation
+              git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/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
+              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}/gitbook/docker-documentation/images/
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
-                cd ${TEMPDIR}/gitbook/docker-documentation/
+                cd ${TEMPDIR}/docs/docker-documentation
-                git add images/docker-${CONTAINER_NAME}.md
+                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
@@ -355,8 +372,9 @@ pipeline {
               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/
@@ -368,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{
@@ -434,35 +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
-              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
        ############### */
@@ -525,44 +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 '''#! /bin/bash
-                  containers=$(docker ps -aq)
-                  if [[ -n "${containers}" ]]; then
-                    docker stop ${containers}
-                  fi
-                  docker system prune -af --volumes || : '''
-          }
-        }
         stage('Build ARM64') {
           agent {
             label 'ARM64'
@@ -635,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
@@ -703,9 +679,7 @@ pipeline {
                 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 \
@@ -740,12 +714,6 @@ pipeline {
       }
       steps {
         withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
           [
             $class: 'UsernamePasswordMultiBinding',
             credentialsId: 'Quay.io-Robot',
@@ -756,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
@@ -787,12 +755,6 @@ pipeline {
       }
       steps {
         withCredentials([
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
-            usernameVariable: 'DOCKERUSER',
-            passwordVariable: 'DOCKERPASS'
-          ],
           [
             $class: 'UsernamePasswordMultiBinding',
             credentialsId: 'Quay.io-Robot',
@@ -803,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
@@ -817,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 create ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:amd64-development ${MANIFESTIMAGE}:arm64v8-development
-                    docker manifest annotate ${MANIFESTIMAGE}:development ${MANIFESTIMAGE}:arm32v7-development --os linux --arch arm
                     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 create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
                     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 create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${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 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 create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
                       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} 
@@ -902,37 +860,39 @@ 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
+    // Add protection to the release branch
-    stage('Sync-README') {
+    stage('Github-Release-Branch-Protection') {
       when {
+        branch "development"
         environment name: 'CHANGE_ID', value: ''
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        withCredentials([
+        echo "Setting up protection for release branch development"
-          [
+        sh '''#! /bin/bash
-            $class: 'UsernamePasswordMultiBinding',
+          curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/development/protection \
-            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
+          -d $(jq -c .  << EOF
-            usernameVariable: 'DOCKERUSER',
+            {
-            passwordVariable: 'DOCKERPASS'
+              "required_status_checks": null,
-          ]
+              "enforce_admins": false,
-        ]) {
+              "required_pull_request_reviews": {
-          sh '''#! /bin/bash
+                "dismiss_stale_reviews": false,
-                set -e
+                "require_code_owner_reviews": false,
-                TEMPDIR=$(mktemp -d)
+                "require_last_push_approval": false,
-                docker pull ghcr.io/linuxserver/jenkins-builder:latest
+                "required_approving_review_count": 1
-                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
+              "restrictions": null,
-                docker run --rm=true \
+              "required_linear_history": false,
-                  -e DOCKERHUB_USERNAME=$DOCKERUSER \
+              "allow_force_pushes": false,
-                  -e DOCKERHUB_PASSWORD=$DOCKERPASS \
+              "allow_deletions": false,
-                  -e GIT_REPOSITORY=${LS_USER}/${LS_REPO} \
+              "block_creations": false,
-                  -e DOCKER_REPOSITORY=${IMAGE} \
+              "required_conversation_resolution": true,
-                  -e GIT_BRANCH=master \
+              "lock_branch": false,
-                  -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/mnt \
+              "allow_fork_syncing": false,
-                  ghcr.io/linuxserver/readme-sync bash -c 'node sync'
+              "required_signatures": false
-                rm -Rf ${TEMPDIR} '''
+            }
-        }
+EOF
+          ) '''
       }
     }
     // If this is a Pull request send the CI link as a comment on it

README.md

@@ -1,6 +1,5 @@
-<!-- DO NOT EDIT THIS FILE MANUALLY  -->
+<!-- DO NOT EDIT THIS FILE MANUALLY -->
-<!-- Please read the https://github.com/linuxserver/docker-heimdall/blob/development/.github/CONTRIBUTING.md -->
+<!-- Please read https://github.com/linuxserver/docker-heimdall/blob/development/.github/CONTRIBUTING.md -->
-
 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
 
 [![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
@@ -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
+id your_user
-    uid=1000(dockeruser) gid=1000(dockergroup) groups=1000(dockergroup)
+```
+
+Example output:
+
+```text
+uid=1000(your_user) gid=1000(your_user) groups=1000(your_user)
 ```
 
 ## Docker Mods
@@ -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`
+* Shell access whilst the container is running:
-* To monitor the logs of the container in realtime: `docker logs -f heimdall`
+
-* container version number
+    ```bash
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' heimdall`
+    docker exec -it heimdall /bin/bash
-* image version number
+    ```
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/heimdall:development`
+
+* 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`
+* Update images:
-  * or update a single image: `docker-compose pull heimdall`
+    * All images:
-* Let compose update all containers as necessary: `docker-compose up -d`
+
-  * or update a single container: `docker-compose up -d heimdall`
+        ```bash
-* You can also remove the old dangling images: `docker image prune`
+        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`
+* Update the image:
-* Stop the running container: `docker stop heimdall`
+
-* Delete the container: `docker rm heimdall`
+    ```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)
+    ```bash
-
+    docker image prune
-* Pull the latest image at its tag and replace it with the same env variables in one run:
+    ```
-
-  ```bash
-  docker run --rm \
-  -v /var/run/docker.sock:/var/run/docker.sock \
-  containrrr/watchtower \
-  --run-once heimdall
-  ```
-
-* You can also remove the old dangling images: `docker image prune`
-
-**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using [Docker Compose](https://docs.linuxserver.io/general/docker-compose).
 
 ### Image Update Notifications - Diun (Docker Image Update Notifier)
 
-* 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,10 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **07.03.24:** - Enable the opcache and disable file revalidation.
+* **06.03.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf.
+* **23.12.23:** - Rebase to Alpine 3.19 with php 8.3.
+* **25.05.23:** - Rebase to Alpine 3.18, deprecate armhf.
 * **13.04.23:** - Move ssl.conf include to default.conf.
 * **20.01.23:** - Rebase to alpine 3.17 with php8.1.
 * **14.11.22:** - Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base)).

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'

package_versions.txt

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

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,10 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "07.03.24:", desc: "Enable the opcache and disable file revalidation."}
+  - { date: "06.03.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." }
+  - { 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))." }

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

@@ -1,4 +1,4 @@
-## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2024/03/06 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample
 
 server {
     listen 80 default_server;
@@ -19,11 +19,16 @@ server {
         #auth_basic "Restricted";
         #auth_basic_user_file /config/nginx/.htpasswd;
 
-        try_files $uri $uri/ /index.html /index.php$is_args$args;
+        try_files $uri $uri/ /index.html /index.htm /index.php$is_args$args;
     }
 
     location ~ ^(.+\.php)(.*)$ {
+        # enable the next two lines for http auth
+        #auth_basic "Restricted";
+        #auth_basic_user_file /config/nginx/.htpasswd;
+
         fastcgi_split_path_info ^(.+\.php)(.*)$;
+        if (!-f $document_root$fastcgi_script_name) { return 404; }
         fastcgi_pass 127.0.0.1:9000;
         fastcgi_index index.php;
         include /etc/nginx/fastcgi_params;

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