Bot Updating Package Versions

.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_invalid_helper.yml

@@ -1,12 +0,0 @@
-name: Comment on invalid interaction
-on:
-  issues:
-    types:
-      - labeled
-jobs:
-  add-comment-on-invalid:
-    if: github.event.label.name == 'invalid'
-    permissions:
-      issues: write
-    uses: linuxserver/github-workflows/.github/workflows/invalid-interaction-helper.yml@v1
-    secrets: inherit

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

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\" \
+                  -v ${WORKSPACE}:/mnt \
-                -e FILE_NAME="shellcheck-result.xml" \
+                  -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
-                -e MIMETYPE="text/xml" \
+                  -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
-                -v ${WORKSPACE}:/mnt \
+                  ghcr.io/linuxserver/baseimage-alpine:3.17 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
-                -e SECRET_KEY=\"${S3_SECRET}\" \
+                    apk add --no-cache py3-pip && \
-                -e ACCESS_KEY=\"${S3_KEY}\" \
+                    pip install s3cmd && \
-                -t ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest \
+                    s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :'''
-                python /upload.py'''
         }
       }
     }
@@ -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\" \
@@ -465,7 +463,7 @@ pipeline {
           --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} \
+          --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\" \
@@ -495,7 +494,7 @@ pipeline {
               --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} \
+              --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\" \
@@ -522,7 +522,7 @@ pipeline {
               --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} \
+              --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\" \
@@ -556,7 +557,7 @@ pipeline {
               --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} \
+              --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
+              touch ${TEMPDIR}/package_versions.txt
-                docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
+              docker run --rm \
-                  apk info -v > /tmp/package_versions.txt && \
+                -v /var/run/docker.sock:/var/run/docker.sock:ro \
-                  sort -o /tmp/package_versions.txt  /tmp/package_versions.txt && \
+                -v ${TEMPDIR}:/tmp \
-                  chmod 777 /tmp/package_versions.txt'
+                ghcr.io/anchore/syft:latest \
-              elif [ "${DIST_IMAGE}" == "ubuntu" ]; then
+                ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
-                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
               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

@@ -60,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
 
@@ -70,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
@@ -96,7 +95,7 @@ services:
     environment:
       - PUID=1000
       - PGID=1000
-      - TZ=Europe/London
+      - TZ=Etc/UTC
     volumes:
       - /path/to/appdata/config:/config
     ports:
@@ -112,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
@@ -130,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)

package_versions.txt

@@ -1,85 +1,227 @@
-alpine-baselayout-3.4.0-r0
+NAME                                VERSION                TYPE         
-alpine-baselayout-data-3.4.0-r0
+alpine-baselayout                   3.4.0-r0               apk           
-alpine-keys-2.4-r1
+alpine-baselayout-data              3.4.0-r0               apk           
-alpine-release-3.17.1-r0
+alpine-keys                         2.4-r1                 apk           
-apache2-utils-2.4.55-r0
+alpine-release                      3.17.2-r0              apk           
-apk-tools-2.12.10-r1
+apache2-utils                       2.4.56-r0              apk           
-apr-1.7.1-r0
+apk-tools                           2.12.10-r1             apk           
-apr-util-1.6.1-r14
+apr                                 1.7.2-r0               apk           
-argon2-libs-20190702-r2
+apr-util                            1.6.3-r0               apk           
-bash-5.2.15-r0
+argon2-libs                         20190702-r2            apk           
-brotli-libs-1.0.9-r9
+barryvdh/laravel-ide-helper         v2.12.3                php-composer  
-busybox-1.35.0-r29
+barryvdh/reflection-docblock        v2.1.0                 php-composer  
-busybox-binsh-1.35.0-r29
+bash                                5.2.15-r0              apk           
-ca-certificates-20220614-r4
+brick/math                          0.9.3                  php-composer  
-ca-certificates-bundle-20220614-r4
+brotli-libs                         1.0.9-r9               apk           
-coreutils-9.1-r0
+busybox                             1.35.0                 binary        
-curl-7.87.0-r1
+busybox                             1.35.0-r29             apk           
-git-2.38.3-r1
+busybox-binsh                       1.35.0-r29             apk           
-icu-data-en-72.1-r1
+ca-certificates                     20220614-r4            apk           
-icu-libs-72.1-r1
+ca-certificates-bundle              20220614-r4            apk           
-jq-1.6-r2
+clue/stream-filter                  v1.6.0                 php-composer  
-libacl-2.3.1-r1
+composer/pcre                       3.1.0                  php-composer  
-libattr-2.5.1-r2
+coreutils                           9.1-r0                 apk           
-libbz2-1.0.8-r4
+curl                                7.88.1-r1              apk           
-libc-utils-0.7.2-r3
+dflydev/dot-access-data             v3.0.2                 php-composer  
-libcrypto3-3.0.7-r2
+doctrine/cache                      2.2.0                  php-composer  
-libcurl-7.87.0-r1
+doctrine/dbal                       3.5.1                  php-composer  
-libedit-20221030.3.1-r0
+doctrine/deprecations               v1.0.0                 php-composer  
-libexpat-2.5.0-r0
+doctrine/event-manager              1.2.0                  php-composer  
-libgcc-12.2.1_git20220924-r4
+doctrine/inflector                  2.0.6                  php-composer  
-libintl-0.21.1-r1
+doctrine/instantiator               1.4.1                  php-composer  
-libpq-15.1-r0
+doctrine/lexer                      1.2.3                  php-composer  
-libproc-3.3.17-r2
+dragonmantank/cron-expression       v3.3.2                 php-composer  
-libssl3-3.0.7-r2
+egulias/email-validator             2.1.25                 php-composer  
-libstdc++-12.2.1_git20220924-r4
+facade/flare-client-php             1.10.0                 php-composer  
-libuuid-2.38.1-r1
+facade/ignition                     2.17.6                 php-composer  
-libxml2-2.10.3-r1
+facade/ignition-contracts           1.0.2                  php-composer  
-libzip-1.9.2-r2
+fideloper/proxy                     4.4.2                  php-composer  
-linux-pam-1.5.2-r1
+filp/whoops                         2.14.6                 php-composer  
-logrotate-3.20.1-r3
+fzaninotto/faker                    v1.9.2                 php-composer  
-musl-1.2.3-r4
+git                                 2.38.4-r1              apk           
-musl-utils-1.2.3-r4
+graham-campbell/bounded-cache       v1.3.0                 php-composer  
-nano-7.0-r0
+graham-campbell/github              v10.6.0                php-composer  
-ncurses-libs-6.3_p20221119-r0
+graham-campbell/manager             v4.7.0                 php-composer  
-ncurses-terminfo-base-6.3_p20221119-r0
+graham-campbell/result-type         v1.1.0                 php-composer  
-nghttp2-libs-1.51.0-r0
+guzzlehttp/guzzle                   7.5.0                  php-composer  
-nginx-1.22.1-r0
+guzzlehttp/promises                 1.5.2                  php-composer  
-oniguruma-6.9.8-r0
+guzzlehttp/psr7                     2.4.3                  php-composer  
-openssl-3.0.7-r2
+hamcrest/hamcrest-php               v2.0.1                 php-composer  
-pcre-8.45-r2
+icu-data-en                         72.1-r1                apk           
-pcre2-10.42-r0
+icu-libs                            72.1-r1                apk           
-php81-8.1.14-r0
+jq                                  1.6-r2                 apk           
-php81-common-8.1.14-r0
+knplabs/github-api                  v3.6.0                 php-composer  
-php81-ctype-8.1.14-r0
+laravel/framework                   v8.83.26               php-composer  
-php81-curl-8.1.14-r0
+laravel/serializable-closure        v1.2.2                 php-composer  
-php81-fileinfo-8.1.14-r0
+laravel/tinker                      v2.7.3                 php-composer  
-php81-fpm-8.1.14-r0
+laravel/ui                          v3.4.6                 php-composer  
-php81-intl-8.1.14-r0
+laravelcollective/html              v6.3.0                 php-composer  
-php81-mbstring-8.1.14-r0
+league/commonmark                   2.3.7                  php-composer  
-php81-mysqlnd-8.1.14-r0
+league/config                       v1.1.1                 php-composer  
-php81-openssl-8.1.14-r0
+league/flysystem                    1.1.10                 php-composer  
-php81-pdo-8.1.14-r0
+league/mime-type-detection          1.11.0                 php-composer  
-php81-pdo_mysql-8.1.14-r0
+libacl                              2.3.1-r1               apk           
-php81-pdo_pgsql-8.1.14-r0
+libattr                             2.5.1-r2               apk           
-php81-pdo_sqlite-8.1.14-r0
+libbsd                              0.11.7-r0              apk           
-php81-session-8.1.14-r0
+libbz2                              1.0.8-r4               apk           
-php81-simplexml-8.1.14-r0
+libc-utils                          0.7.2-r3               apk           
-php81-tokenizer-8.1.14-r0
+libcrypto3                          3.0.8-r3               apk           
-php81-xml-8.1.14-r0
+libcurl                             7.88.1-r1              apk           
-php81-xmlwriter-8.1.14-r0
+libedit                             20221030.3.1-r0        apk           
-php81-zip-8.1.14-r0
+libexpat                            2.5.0-r0               apk           
-popt-1.19-r0
+libgcc                              12.2.1_git20220924-r4  apk           
-procps-3.3.17-r2
+libintl                             0.21.1-r1              apk           
-readline-8.2.0-r0
+libmd                               1.0.4-r0               apk           
-scanelf-1.3.5-r1
+libpq                               15.2-r0                apk           
-shadow-4.13-r0
+libproc                             3.3.17-r2              apk           
-skalibs-2.12.0.1-r0
+libssl3                             3.0.8-r3               apk           
-sqlite-libs-3.40.1-r0
+libstdc++                           12.2.1_git20220924-r4  apk           
-ssl_client-1.35.0-r29
+libuuid                             2.38.1-r1              apk           
-tzdata-2022f-r1
+libxml2                             2.10.3-r1              apk           
-utmps-libs-0.1.2.0-r1
+libzip                              1.9.2-r2               apk           
-xz-5.2.9-r0
+linux-pam                           1.5.2-r1               apk           
-xz-libs-5.2.9-r0
+logrotate                           3.20.1-r3              apk           
-zlib-1.2.13-r0
+mockery/mockery                     1.5.1                  php-composer  
-zstd-libs-1.5.2-r9
+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.17                 binary        
+php-fpm                             8.1.17                 binary        
+php-http/cache-plugin               1.7.5                  php-composer  
+php-http/client-common              2.6.0                  php-composer  
+php-http/discovery                  1.14.3                 php-composer  
+php-http/httplug                    2.3.0                  php-composer  
+php-http/message                    1.13.0                 php-composer  
+php-http/message-factory            v1.0.2                 php-composer  
+php-http/multipart-stream-builder   1.2.0                  php-composer  
+php-http/promise                    1.1.0                  php-composer  
+php81                               8.1.17-r0              apk           
+php81-common                        8.1.17-r0              apk           
+php81-ctype                         8.1.17-r0              apk           
+php81-curl                          8.1.17-r0              apk           
+php81-fileinfo                      8.1.17-r0              apk           
+php81-fpm                           8.1.17-r0              apk           
+php81-intl                          8.1.17-r0              apk           
+php81-mbstring                      8.1.17-r0              apk           
+php81-mysqlnd                       8.1.17-r0              apk           
+php81-openssl                       8.1.17-r0              apk           
+php81-pdo                           8.1.17-r0              apk           
+php81-pdo_mysql                     8.1.17-r0              apk           
+php81-pdo_pgsql                     8.1.17-r0              apk           
+php81-pdo_sqlite                    8.1.17-r0              apk           
+php81-session                       8.1.17-r0              apk           
+php81-simplexml                     8.1.17-r0              apk           
+php81-tokenizer                     8.1.17-r0              apk           
+php81-xml                           8.1.17-r0              apk           
+php81-xmlwriter                     8.1.17-r0              apk           
+php81-zip                           8.1.17-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                              2023b-r1               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.2-r9               apk