Bot Updating Package Versions

Move ssl.conf include to default.conf

.editorconfig

@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
 indent_style = space
 indent_size = 2
 
-[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
+[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
 indent_style = space
 indent_size = 4

.github/workflows/call_issue_pr_tracker.yml

@@ -0,0 +1,14 @@
+name: Issue & PR Tracker
+
+on:
+  issues:
+    types: [opened,reopened,labeled,unlabeled]
+  pull_request_target:
+    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled]
+
+jobs:
+  manage-project:
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
+    secrets: inherit

.github/workflows/call_issues_cron.yml

@@ -0,0 +1,13 @@
+name: Mark stale issues and pull requests
+on:
+  schedule:
+    - cron:  '14 15 * * *'
+  workflow_dispatch:
+
+jobs:
+  stale:
+    permissions:
+      issues: write
+      pull-requests: write
+    uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1
+    secrets: inherit

.github/workflows/greetings.yml

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

.github/workflows/package_trigger_scheduler.yml

@@ -2,7 +2,7 @@ name: Package Trigger Scheduler
 
 on:
   schedule:
-    - cron:  '54 7 * * 0'
+    - cron:  '14 18 * * 5'
   workflow_dispatch:
 
 jobs:

.github/workflows/permissions.yml

@@ -0,0 +1,10 @@
+name: Permission check
+on:
+  pull_request_target:
+    paths:
+      - '**/run'
+      - '**/finish'
+      - '**/check'
+jobs:
+  permission_check:
+    uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1

.github/workflows/stale.yml

@@ -1,23 +0,0 @@
-name: Mark stale issues and pull requests
-
-on:
-  schedule:
-  - cron: "30 1 * * *"
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/stale@v6.0.1
-      with:
-        stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
-        stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
-        stale-issue-label: 'no-issue-activity'
-        stale-pr-label: 'no-pr-activity'
-        days-before-stale: 30
-        days-before-close: 365
-        exempt-issue-labels: 'awaiting-approval,work-in-progress'
-        exempt-pr-labels: 'awaiting-approval,work-in-progress'
-        repo-token: ${{ secrets.GITHUB_TOKEN }}

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -13,16 +15,19 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache --upgrade \
-    curl \
-    php8-ctype \
-    php8-curl \
-    php8-intl \
-    php8-pdo_pgsql \
-    php8-pdo_sqlite \
-    php8-pdo_mysql \
-    php8-tokenizer \
-    php8-zip \
-    tar && \
+    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 && \
@@ -31,8 +36,13 @@ RUN \
     | awk '/sha/{print $4;exit}' FS='[""]'); \
   fi && \
   curl -o \
-    /heimdall/heimdall.tar.gz -L \
+    /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/*

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -13,16 +15,19 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache --upgrade \
-    curl \
-    php8-ctype \
-    php8-curl \
-    php8-intl \
-    php8-pdo_pgsql \
-    php8-pdo_sqlite \
-    php8-pdo_mysql \
-    php8-tokenizer \
-    php8-zip \
-    tar && \
+    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 && \
@@ -31,8 +36,13 @@ RUN \
     | awk '/sha/{print $4;exit}' FS='[""]'); \
   fi && \
   curl -o \
-    /heimdall/heimdall.tar.gz -L \
+    /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/*

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -13,16 +15,19 @@ ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2
 RUN \
   echo "**** install runtime packages ****" && \
   apk add --no-cache --upgrade \
-    curl \
-    php8-ctype \
-    php8-curl \
-    php8-intl \
-    php8-pdo_pgsql \
-    php8-pdo_sqlite \
-    php8-pdo_mysql \
-    php8-tokenizer \
-    php8-zip \
-    tar && \
+    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 && \
@@ -31,8 +36,13 @@ RUN \
     | awk '/sha/{print $4;exit}' FS='[""]'); \
   fi && \
   curl -o \
-    /heimdall/heimdall.tar.gz -L \
+    /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/*

Jenkinsfile

@@ -59,7 +59,7 @@ pipeline {
           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/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml'
+          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'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -69,7 +69,7 @@ pipeline {
         script{
           env.LS_TAG_NUMBER = sh(
             script: '''#! /bin/bash
-                       tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
+                       tagsha=$(git rev-list -n 1 development-${LS_RELEASE} 2>/dev/null)
                        if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
                          echo ${LS_RELEASE_NUMBER}
                        elif [ -z "${GIT_COMMIT}" ]; then
@@ -240,17 +240,14 @@ pipeline {
           }
           sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
           sh '''#! /bin/bash
-                set -e
-                docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest
                 docker run --rm \
-                -e DESTINATION=\"${IMAGE}/${META_TAG}/shellcheck-result.xml\" \
-                -e FILE_NAME="shellcheck-result.xml" \
-                -e MIMETYPE="text/xml" \
-                -v ${WORKSPACE}:/mnt \
-                -e SECRET_KEY=\"${S3_SECRET}\" \
-                -e ACCESS_KEY=\"${S3_KEY}\" \
-                -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \
-                python /upload.py'''
+                  -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 && \
+                    s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
         }
       }
     }
@@ -287,7 +284,7 @@ pipeline {
                 echo "Jenkinsfile is up to date."
               fi
               # Stage 2 - Delete old templates
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md\n.github/ISSUE_TEMPLATE/issue.bug.md\n.github/ISSUE_TEMPLATE/issue.feature.md"
+              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"
               for i in ${OLD_TEMPLATES}; do
                 if [[ -f "${i}" ]]; then
                   TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -304,7 +301,7 @@ pipeline {
                 git commit -m 'Bot Updating Templated Files'
                 git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Deleting old templates"
+                echo "Deleting old and deprecated templates"
                 rm -Rf ${TEMPDIR}
                 exit 0
               else
@@ -452,7 +449,8 @@ pipeline {
       }
       steps {
         echo "Running on node: ${NODE_NAME}"
-        sh "docker build \
+        sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
+        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\" \
@@ -464,8 +462,8 @@ pipeline {
           --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 -t ${IMAGE}:${META_TAG} \
+          --label \"org.opencontainers.image.description=[Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way.    Simplicity is the key to Heimdall.    Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.  \" \
+          --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
           --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
       }
     }
@@ -482,7 +480,8 @@ pipeline {
         stage('Build X86') {
           steps {
             echo "Running on node: ${NODE_NAME}"
-            sh "docker build \
+            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
+            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\" \
@@ -494,8 +493,8 @@ pipeline {
               --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 -t ${IMAGE}:amd64-${META_TAG} \
+              --label \"org.opencontainers.image.description=[Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way.    Simplicity is the key to Heimdall.    Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.  \" \
+              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
           }
         }
@@ -509,7 +508,8 @@ pipeline {
             sh '''#! /bin/bash
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                '''
-            sh "docker build \
+            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\" \
@@ -521,8 +521,8 @@ pipeline {
               --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} \
+              --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) {
@@ -543,7 +543,8 @@ pipeline {
             sh '''#! /bin/bash
                   echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                '''
-            sh "docker build \
+            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64"
+            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\" \
@@ -555,8 +556,8 @@ pipeline {
               --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.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
+              --label \"org.opencontainers.image.description=[Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way.    Simplicity is the key to Heimdall.    Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.  \" \
+              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
               --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
             sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
             retry(5) {
@@ -585,26 +586,12 @@ pipeline {
               else
                 LOCAL_CONTAINER=${IMAGE}:${META_TAG}
               fi
-              if [ "${DIST_IMAGE}" == "alpine" ]; then
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  apk info -v > /tmp/package_versions.txt && \
-                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
-                  chmod 777 /tmp/package_versions.txt'
-              elif [ "${DIST_IMAGE}" == "ubuntu" ]; then
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
-                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
-                  chmod 777 /tmp/package_versions.txt'
-              elif [ "${DIST_IMAGE}" == "fedora" ]; then
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  rpm -qa > /tmp/package_versions.txt && \
-                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
-                  chmod 777 /tmp/package_versions.txt'
-              elif [ "${DIST_IMAGE}" == "arch" ]; then
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
-                  pacman -Q > /tmp/package_versions.txt && \
-                  chmod 777 /tmp/package_versions.txt'
-              fi
+              touch ${TEMPDIR}/package_versions.txt
+              docker run --rm \
+                -v /var/run/docker.sock:/var/run/docker.sock:ro \
+                -v ${TEMPDIR}:/tmp \
+                ghcr.io/anchore/syft:latest \
+                ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
               NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
               echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
               if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
@@ -815,19 +802,19 @@ pipeline {
                   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 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 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
                   for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
                     docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                     docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-development
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-development
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-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}
@@ -835,13 +822,13 @@ pipeline {
                       docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                     fi
                     docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-development
-                    docker push ${MANIFESTIMAGE}:arm32v7-development
-                    docker push ${MANIFESTIMAGE}:arm64v8-development
                     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}
@@ -987,12 +974,12 @@ pipeline {
           sh 'echo "build aborted"'
         }
         else if (currentBuild.currentResult == "SUCCESS"){
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\
                  "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }
         else {
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
                  "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                  "username": "Jenkins"}' ${BUILDS_DISCORD} '''
         }

README.md

@@ -41,7 +41,9 @@ Find us at:
 [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fheimdall%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/heimdall/latest/index.html)
 
 [Heimdall](https://heimdall.site) is a way to organise all those links to your most used web sites and web applications in a simple way.
+
 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.
 
 [![heimdall](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/heimdall-banner.png)](https://heimdall.site)
@@ -58,7 +60,7 @@ The architectures supported by this image are:
 | :----: | :----: | ---- |
 | x86-64 | ✅ | amd64-\<version tag\> |
 | arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf| ✅ | arm32v7-\<version tag\> |
+| armhf | ✅ | arm32v7-\<version tag\> |
 
 ## Version Tags
 
@@ -68,7 +70,6 @@ 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
@@ -94,7 +95,7 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Europe/London
+      - TZ=Etc/UTC
     volumes:
       - /path/to/appdata/config:/config
     ports:
@@ -110,12 +111,13 @@ docker run -d \
   --name=heimdall \
   -e PUID=1000 \
   -e PGID=1000 \
-  -e TZ=Europe/London \
+  -e TZ=Etc/UTC \
   -p 80:80 \
   -p 443:443 \
   -v /path/to/appdata/config:/config \
   --restart unless-stopped \
   lscr.io/linuxserver/heimdall:development
+
 ```
 
 ## Parameters
@@ -128,7 +130,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-p 443` | https gui |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
-| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London |
+| `-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. |
 
 ## Environment variables from files (Docker secrets)
@@ -240,6 +242,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **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.
 * **13.03.21:** - Make searchproviders.yaml user configurable.

package_versions.txt

@@ -1,83 +1,227 @@
-alpine-baselayout-3.2.0-r18
-alpine-keys-2.4-r1
-apache2-utils-2.4.54-r0
-apk-tools-2.12.7-r3
-apr-1.7.0-r1
-apr-util-1.6.1-r11
-argon2-libs-20190702-r1
-bash-5.1.16-r0
-brotli-libs-1.0.9-r5
-busybox-1.34.1-r7
-ca-certificates-20220614-r0
-ca-certificates-bundle-20220614-r0
-coreutils-9.0-r2
-curl-7.80.0-r4
-expat-2.5.0-r0
-git-2.34.5-r0
-icu-libs-69.1-r1
-libacl-2.2.53-r0
-libattr-2.5.1-r1
-libbz2-1.0.8-r1
-libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1s-r1
-libcurl-7.80.0-r4
-libedit-20210910.3.1-r0
-libgcc-10.3.1_git20211027-r0
-libintl-0.21-r0
-libpq-14.5-r0
-libproc-3.3.17-r0
-libretls-3.3.4-r3
-libssl1.1-1.1.1s-r1
-libstdc++-10.3.1_git20211027-r0
-libuuid-2.37.4-r0
-libxml2-2.9.14-r2
-libzip-1.8.0-r1
-linux-pam-1.5.2-r0
-logrotate-3.18.1-r4
-musl-1.2.2-r7
-musl-utils-1.2.2-r7
-nano-5.9-r0
-ncurses-libs-6.3_p20211120-r1
-ncurses-terminfo-base-6.3_p20211120-r1
-nghttp2-libs-1.46.0-r0
-nginx-1.20.2-r1
-oniguruma-6.9.7.1-r0
-openssl-1.1.1s-r1
-pcre-8.45-r1
-pcre2-10.40-r0
-php8-8.0.25-r0
-php8-common-8.0.25-r0
-php8-ctype-8.0.25-r0
-php8-curl-8.0.25-r0
-php8-fileinfo-8.0.25-r0
-php8-fpm-8.0.25-r0
-php8-intl-8.0.25-r0
-php8-mbstring-8.0.25-r0
-php8-mysqlnd-8.0.25-r0
-php8-openssl-8.0.25-r0
-php8-pdo-8.0.25-r0
-php8-pdo_mysql-8.0.25-r0
-php8-pdo_pgsql-8.0.25-r0
-php8-pdo_sqlite-8.0.25-r0
-php8-session-8.0.25-r0
-php8-simplexml-8.0.25-r0
-php8-tokenizer-8.0.25-r0
-php8-xml-8.0.25-r0
-php8-xmlwriter-8.0.25-r0
-php8-zip-8.0.25-r0
-popt-1.18-r0
-procps-3.3.17-r0
-readline-8.1.1-r0
-s6-ipcserver-2.11.0.0-r0
-scanelf-1.3.3-r0
-shadow-4.8.1-r1
-skalibs-2.11.0.0-r0
-sqlite-libs-3.36.0-r0
-ssl_client-1.34.1-r7
-tar-1.34-r0
-tzdata-2022f-r1
-utmps-0.1.0.3-r0
-xz-5.2.5-r1
-xz-libs-5.2.5-r1
-zlib-1.2.12-r3
-zstd-libs-1.5.0-r0
+NAME                                VERSION                TYPE         
+alpine-baselayout                   3.4.0-r0               apk           
+alpine-baselayout-data              3.4.0-r0               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                                8.0.1-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  
+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           
+phar-io/manifest                    2.0.3                  php-composer  
+phar-io/version                     3.2.1                  php-composer  
+php-cli                             8.1.18                 binary        
+php-fpm                             8.1.18                 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.18-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.18-r0              apk           
+php81-fpm                           8.1.18-r0              apk           
+php81-intl                          8.1.18-r0              apk           
+php81-mbstring                      8.1.18-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.18-r0              apk           
+php81-simplexml                     8.1.18-r0              apk           
+php81-tokenizer                     8.1.18-r0              apk           
+php81-xml                           8.1.18-r0              apk           
+php81-xmlwriter                     8.1.18-r0              apk           
+php81-zip                           8.1.18-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  
+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  
+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  
+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           
+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/exporter                  4.0.5                  php-composer  
+sebastian/global-state              5.0.5                  php-composer  
+sebastian/lines-of-code             1.0.3                  php-composer  
+sebastian/object-enumerator         4.0.4                  php-composer  
+sebastian/object-reflector          2.0.4                  php-composer  
+sebastian/recursion-context         4.0.4                  php-composer  
+sebastian/resource-operations       3.0.3                  php-composer  
+sebastian/type                      3.2.0                  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  
+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  
+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           

readme-vars.yml

@@ -4,11 +4,12 @@
 project_name: heimdall
 project_url: "https://heimdall.site"
 project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/heimdall-banner.png"
-project_blurb: "[{{ project_name|capitalize }}]({{ project_url }}) is a way to organise all those links to your most used web sites and web applications in a simple way.
+project_blurb: |
+  [{{ project_name|capitalize }}]({{ project_url }}) 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.
+  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."
+  Why not use it as your browser start page? It even has the ability to include a search bar using either Google, Bing or DuckDuckGo.
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
 
 # supported architectures
@@ -58,6 +59,8 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
+  - { date: "20.01.23:", desc: "Rebase to alpine 3.17 with php8.1." }
   - { date: "14.11.22:", desc: "Rebasing to alpine 3.15 with php8. Restructure nginx configs ([see changes announcement](https://info.linuxserver.io/issues/2022-08-20-nginx-base))." }
   - { date: "04.11.22:", desc: "Build commits to upstream branch 2.x." }
   - { date: "13.03.21:", desc: "Make searchproviders.yaml user configurable." }

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;
 

root/etc/s6-overlay/s6-rc.d/init-heimdall-config/run

@@ -4,18 +4,14 @@
 # make our folders
 mkdir -p \
     /config/www/{avatars,backgrounds,icons,logs,SupportedApps} \
-    /app/www \
     /config/log/heimdall
 
 # install heimdall if necessary
-if [[ -f /heimdall/heimdall.tar.gz ]]; then
+if [[ -d /app/www-tmp ]]; then
     echo "New container detected, installing Heimdall"
-    tar xf \
-        /heimdall/heimdall.tar.gz -C \
-        /app/www --strip-components=1
-    echo -e '\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
-        /etc/nginx/fastcgi_params
+    mv /app/www-tmp /app/www
     cp /app/www/storage/app/searchproviders.yaml /app/www/storage/app/searchproviders.yaml.orig
+    touch /app/set-perms
 fi
 
 # create symlinks
@@ -45,10 +41,11 @@ rm -rf /app/www/storage/app/searchproviders.yaml
 ln -s /config/www/searchproviders.yaml /app/www/storage/app/searchproviders.yaml
 
 # tidy up install files & set permissions
-if [[ -f /heimdall/heimdall.tar.gz ]]; then
-    rm -rf /heimdall
-    chown -R abc:abc /app/www
-    chown -R abc:abc /config
+if [[ -f /app/set-perms ]]; then
+    rm -rf /app/set-perms
+    lsiown -R abc:abc \
+        /app/www \
+        /config
 fi
 
 # copy .env if not exists

root/etc/s6-overlay/s6-rc.d/init-heimdall-config/type

@@ -0,0 +1 @@
+oneshot

root/etc/s6-overlay/s6-rc.d/init-heimdall-config/up

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-heimdall-config/run

root/etc/s6-overlay/s6-rc.d/svc-queue/type

@@ -0,0 +1 @@
+longrun