Bot Updating Package Versions

.github/ISSUE_TEMPLATE/issue.bug.yml

@@ -53,7 +53,6 @@ body:
       options:
         - x86-64
         - arm64
-        - armhf
     validations:
       required: true
   - type: textarea

.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,16 @@
+name: Issue & PR Tracker
+
+on:
+  issues:
+    types: [opened,reopened,labeled,unlabeled,closed]
+  pull_request_target:
+    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
+  pull_request_review:
+    types: [submitted,edited,dismissed]
+
+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:  '58 22 * * *'
+  workflow_dispatch:
+
+jobs:
+  stale:
+    permissions:
+      issues: write
+      pull-requests: write
+    uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1
+    secrets: inherit

.github/workflows/external_trigger.yml

@@ -14,9 +14,11 @@ jobs:
         run: |
           if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_RADARR_MASTER }}" ]; then
             echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_RADARR_MASTER is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_RADARR_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
           echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_RADARR_MASTER\". ****"
+          echo "External trigger running off of master branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_RADARR_MASTER\`" >> $GITHUB_STEP_SUMMARY
           echo "**** Retrieving external version ****"
           EXT_RELEASE=$(curl -sL https://radarr.servarr.com/v1/update/master/changes?runtime=netcore%26os=linuxmusl | jq -r '.[0].version')
           if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
@@ -30,6 +32,7 @@ jobs:
           fi
           EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
           echo "**** External version: ${EXT_RELEASE} ****"
+          echo "External version: ${EXT_RELEASE}" >> $GITHUB_STEP_SUMMARY
           echo "**** Retrieving last pushed version ****"
           image="linuxserver/radarr"
           tag="latest"
@@ -65,14 +68,18 @@ jobs:
             exit 1
           fi
           echo "**** Last pushed version: ${IMAGE_VERSION} ****"
+          echo "Last pushed version: ${IMAGE_VERSION}" >> $GITHUB_STEP_SUMMARY
           if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
             echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
+            echo "Version ${EXT_RELEASE} already pushed, exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
           elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-radarr/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
             echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
+            echo "New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
             exit 0
           else
             echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
+            echo "New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build" >> $GITHUB_STEP_SUMMARY
             response=$(curl -iX POST \
               https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-radarr/job/master/buildWithParameters?PACKAGE_CHECK=false \
               --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
@@ -82,6 +89,7 @@ jobs:
             buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
             buildurl="${buildurl%$'\r'}"
             echo "**** Jenkins job build url: ${buildurl} ****"
+            echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
             echo "**** Attempting to change the Jenkins job description ****"
             curl -iX POST \
               "${buildurl}submitDescription" \

.github/workflows/external_trigger_scheduler.yml

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

.github/workflows/package_trigger.yml

@@ -14,13 +14,16 @@ jobs:
         run: |
           if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_RADARR_MASTER }}" ]; then
             echo "**** Github secret PAUSE_PACKAGE_TRIGGER_RADARR_MASTER is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_RADARR_MASTER\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
           if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-radarr/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
             echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
+            echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
           echo "**** Package trigger running off of master branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_RADARR_MASTER\". ****"
+          echo "Package trigger running off of master branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_RADARR_MASTER\`" >> $GITHUB_STEP_SUMMARY
           response=$(curl -iX POST \
             https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-radarr/job/master/buildWithParameters?PACKAGE_CHECK=true \
             --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
@@ -30,6 +33,7 @@ jobs:
           buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
           buildurl="${buildurl%$'\r'}"
           echo "**** Jenkins job build url: ${buildurl} ****"
+          echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY
           echo "**** Attempting to change the Jenkins job description ****"
           curl -iX POST \
             "${buildurl}submitDescription" \

.github/workflows/package_trigger_scheduler.yml

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

.github/workflows/permissions.yml

@@ -1,9 +1,10 @@
 name: Permission check
 on:
-  pull_request:
+  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,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.17
+FROM ghcr.io/linuxserver/baseimage-alpine:3.18
 
 # set version label
 ARG BUILD_DATE
@@ -17,7 +17,8 @@ RUN \
   echo "**** install packages ****" && \
   apk add -U --upgrade --no-cache \
     icu-libs \
-    sqlite-libs && \
+    sqlite-libs \
+    xmlstarlet && \
   echo "**** install radarr ****" && \
   mkdir -p /app/radarr/bin && \
   if [ -z ${RADARR_RELEASE+x} ]; then \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
 
 # set version label
 ARG BUILD_DATE
@@ -16,7 +16,8 @@ RUN \
   echo "**** install packages ****" && \
   apk add -U --upgrade --no-cache \
     icu-libs \
-    sqlite-libs && \
+    sqlite-libs \
+    xmlstarlet && \
   echo "**** install radarr ****" && \
   mkdir -p /app/radarr/bin && \
   if [ -z ${RADARR_RELEASE+x} ]; then \

Dockerfile.armhf

@@ -1,45 +0,0 @@
-# syntax=docker/dockerfile:1
-
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
-
-# set version label
-ARG BUILD_DATE
-ARG VERSION
-ARG RADARR_RELEASE
-LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="thelamer"
-
-# environment settings
-ARG RADARR_BRANCH="master"
-ENV XDG_CONFIG_HOME="/config/xdg"
-
-RUN \
-  echo "**** install packages ****" && \
-  apk add -U --upgrade --no-cache \
-    icu-libs \
-    sqlite-libs && \
-  echo "**** install radarr ****" && \
-  mkdir -p /app/radarr/bin && \
-  if [ -z ${RADARR_RELEASE+x} ]; then \
-    RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linuxmusl" \
-    | jq -r '.[0].version'); \
-  fi && \
-  curl -o \
-    /tmp/radarr.tar.gz -L \
-    "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linuxmusl&runtime=netcore&arch=arm" && \
-  tar xzf \
-    /tmp/radarr.tar.gz -C \
-    /app/radarr/bin --strip-components=1 && \
-  echo "**** cleanup ****" && \
-  echo -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://linuxserver.io)" > /app/radarr/package_info && \
-  rm -rf \
-    /app/radarr/bin/Radarr.Update \
-    /tmp/*
-
-# copy local files
-COPY root/ /
-
-# ports and volumes
-EXPOSE 7878
-
-VOLUME /config

Jenkinsfile

@@ -39,10 +39,16 @@ pipeline {
     // Setup all the basic environment variables needed for the build
     stage("Set ENV Variables base"){
       steps{
+        sh '''#! /bin/bash
+              containers=$(docker ps -aq)
+              if [[ -n "${containers}" ]]; then
+                docker stop ${containers}
+              fi
+              docker system prune -af --volumes || : '''
         script{
           env.EXIT_STATUS = ''
           env.LS_RELEASE = sh(
-            script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
+            script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:latest 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
             returnStdout: true).trim()
           env.LS_RELEASE_NOTES = sh(
             script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -56,7 +62,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/call_invalid_helper.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
+          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 ./root/donate.txt'
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -157,7 +163,7 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           } else {
             env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
           }
@@ -180,7 +186,7 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           } else {
             env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
           }
@@ -203,12 +209,12 @@ pipeline {
           env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
           env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
           if (env.MULTIARCH == 'true') {
-            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           } else {
-            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           }
-          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
-          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+          env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
           env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
           env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
           env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
@@ -228,19 +234,16 @@ pipeline {
           script{
             env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml'
           }
-          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
+          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-jenkins-builder/master/checkrun.sh | /bin/bash'''
           sh '''#! /bin/bash
-                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" || :'''
         }
       }
     }
@@ -277,7 +280,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 Dockerfile.armhf"
               for i in ${OLD_TEMPLATES}; do
                 if [[ -f "${i}" ]]; then
                   TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -294,7 +297,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
@@ -313,12 +316,13 @@ pipeline {
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                 mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
                 cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
+                cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
                 cd ${TEMPDIR}/repo/${LS_REPO}/
                 if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
                   echo ".jenkins-external" >> .gitignore
                   git add .gitignore
                 fi
-                git add ${TEMPLATED_FILES}
+                git add readme-vars.yml ${TEMPLATED_FILES}
                 git commit -m 'Bot Updating Templated Files'
                 git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
@@ -339,6 +343,8 @@ pipeline {
               git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
               if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
                 sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
+              elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
+                sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
               fi
               if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
                 cd ${TEMPDIR}/unraid/templates/
@@ -379,6 +385,26 @@ pipeline {
         }
       }
     }
+    // If this is a master build check the S6 service file perms
+    stage("Check S6 Service file Permissions"){
+      when {
+        branch "master"
+        environment name: 'CHANGE_ID', value: ''
+        environment name: 'EXIT_STATUS', value: ''
+      }
+      steps {
+        script{
+          sh '''#! /bin/bash
+            WRONG_PERM=$(find ./  -path "./.git" -prune -o \\( -name "run" -o -name "finish" -o -name "check" \\) -not -perm -u=x,g=x,o=x -print)
+            if [[ -n "${WRONG_PERM}" ]]; then
+              echo "The following S6 service files are missing the executable bit; canceling the faulty build: ${WRONG_PERM}"
+              exit 1
+            else
+              echo "S6 service file perms look good."
+            fi '''
+        }
+      }
+    }
     /* #######################
            GitLab Mirroring
        ####################### */
@@ -410,8 +436,7 @@ pipeline {
       }
       steps{
         sh '''#! /bin/bash
-              set -e
-              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/radarr") | .uuid')
+              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/radarr") | .uuid' || :)
               if [ -z "${PACKAGE_UUID}" ]; then
                 echo "Adding package to Scarf.sh"
                 curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
@@ -442,7 +467,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-radarr/packages\" \
@@ -455,7 +481,7 @@ pipeline {
           --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
           --label \"org.opencontainers.image.title=Radarr\" \
           --label \"org.opencontainers.image.description=[Radarr](https://github.com/Radarr/Radarr) - A fork of Sonarr to work with movies à la Couchpotato.  \" \
-          --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} ."
       }
     }
@@ -472,7 +498,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-radarr/packages\" \
@@ -485,44 +512,10 @@ pipeline {
               --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
               --label \"org.opencontainers.image.title=Radarr\" \
               --label \"org.opencontainers.image.description=[Radarr](https://github.com/Radarr/Radarr) - A fork of Sonarr to work with movies à la Couchpotato.  \" \
-              --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} ."
           }
         }
-        stage('Build ARMHF') {
-          agent {
-            label 'ARMHF'
-          }
-          steps {
-            echo "Running on node: ${NODE_NAME}"
-            echo 'Logging into Github'
-            sh '''#! /bin/bash
-                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
-               '''
-            sh "docker 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-radarr/packages\" \
-              --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-radarr\" \
-              --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-radarr\" \
-              --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
-              --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
-              --label \"org.opencontainers.image.vendor=linuxserver.io\" \
-              --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
-              --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
-              --label \"org.opencontainers.image.title=Radarr\" \
-              --label \"org.opencontainers.image.description=[Radarr](https://github.com/Radarr/Radarr) - A fork of Sonarr to work with movies à la Couchpotato.  \" \
-              --no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
-              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
-            sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-            retry(5) {
-              sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
-            }
-            sh '''docker rmi \
-                  ${IMAGE}:arm32v7-${META_TAG} \
-                  ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
-          }
-        }
         stage('Build ARM64') {
           agent {
             label 'ARM64'
@@ -533,7 +526,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-radarr/packages\" \
@@ -546,15 +540,18 @@ pipeline {
               --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
               --label \"org.opencontainers.image.title=Radarr\" \
               --label \"org.opencontainers.image.description=[Radarr](https://github.com/Radarr/Radarr) - A fork of Sonarr to work with movies à la Couchpotato.  \" \
-              --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) {
               sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
             }
-            sh '''docker rmi \
-                  ${IMAGE}:arm64v8-${META_TAG} \
-                  ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
+            sh '''#! /bin/bash
+                  containers=$(docker ps -aq)
+                  if [[ -n "${containers}" ]]; then
+                    docker stop ${containers}
+                  fi
+                  docker system prune -af --volumes || : '''
           }
         }
       }
@@ -575,26 +572,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
@@ -629,13 +612,6 @@ pipeline {
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        sh '''#! /bin/bash
-              echo "Packages were updated. Cleaning up the image and exiting."
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
-                docker rmi ${IMAGE}:amd64-${META_TAG}
-              else
-                docker rmi ${IMAGE}:${META_TAG}
-              fi'''
         script{
           env.EXIT_STATUS = 'ABORTED'
         }
@@ -653,13 +629,6 @@ pipeline {
         }
       }
       steps {
-        sh '''#! /bin/bash
-              echo "There are no package updates. Cleaning up the image and exiting."
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
-                docker rmi ${IMAGE}:amd64-${META_TAG}
-              else
-                docker rmi ${IMAGE}:${META_TAG}
-              fi'''
         script{
           env.EXIT_STATUS = 'ABORTED'
         }
@@ -681,14 +650,13 @@ pipeline {
         ]) {
           script{
             env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html'
+            env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json'
           }
           sh '''#! /bin/bash
                 set -e
                 docker pull ghcr.io/linuxserver/ci:latest
                 if [ "${MULTIARCH}" == "true" ]; then
-                  docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
                   docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
-                  docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                   docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                 fi
                 docker run --rm \
@@ -707,8 +675,6 @@ pipeline {
                 -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                 -e WEB_AUTH=\"${CI_AUTH}\" \
                 -e WEB_PATH=\"${CI_WEBPATH}\" \
-                -e DO_REGION="ams3" \
-                -e DO_BUCKET="lsio-ci" \
                 -t ghcr.io/linuxserver/ci:latest \
                 python3 test_build.py'''
         }
@@ -761,17 +727,6 @@ pipeline {
                   done
                '''
           }
-          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
-                  docker rmi \
-                  ${DELETEIMAGE}:${META_TAG} \
-                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:latest || :
-                  if [ -n "${SEMVER}" ]; then
-                    docker rmi ${DELETEIMAGE}:${SEMVER} || :
-                  fi
-                done
-             '''
         }
       }
     }
@@ -804,8 +759,6 @@ pipeline {
                   echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                   echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                   if [ "${CI}" == "false" ]; then
-                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                     docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
                     docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
                   fi
@@ -813,49 +766,47 @@ pipeline {
                     docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
                     docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
                     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-latest
-                    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-latest
                     docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                     if [ -n "${SEMVER}" ]; then
                       docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
                       docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                     fi
                     docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
                     docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                     docker push ${MANIFESTIMAGE}:amd64-latest
-                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm32v7-latest
-                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                     docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                     docker push ${MANIFESTIMAGE}:arm64v8-latest
                     docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                     if [ -n "${SEMVER}" ]; then
                       docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
                       docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                     fi
                     docker manifest push --purge ${MANIFESTIMAGE}:latest || :
-                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
-                    docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
+                    docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm64v8-latest
                     docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
                     docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
+                    docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                     docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
                     docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
-                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
+                    docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
                     docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
                     if [ -n "${SEMVER}" ]; then
                       docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
-                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                      docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
+                      docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
                       docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
                     fi
+                    token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
+                    digest=$(curl -s \
+                      --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
+                      --header "Authorization: Bearer ${token}" \
+                      "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-latest")
+                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
+                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest || :
+                      docker manifest create ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:amd64-latest
+                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-latest
+                    fi
                     docker manifest push --purge ${MANIFESTIMAGE}:latest
                     docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
                     docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
@@ -865,29 +816,6 @@ pipeline {
                   done
                '''
           }
-          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
-                  docker rmi \
-                  ${DELETEIMAGE}:amd64-${META_TAG} \
-                  ${DELETEIMAGE}:amd64-latest \
-                  ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
-                  ${DELETEIMAGE}:arm32v7-latest \
-                  ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
-                  ${DELETEIMAGE}:arm64v8-latest \
-                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
-                  if [ -n "${SEMVER}" ]; then
-                    docker rmi \
-                    ${DELETEIMAGE}:amd64-${SEMVER} \
-                    ${DELETEIMAGE}:arm32v7-${SEMVER} \
-                    ${DELETEIMAGE}:arm64v8-${SEMVER} || :
-                  fi
-                done
-                docker rmi \
-                ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
-                ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
-             '''
         }
       }
     }
@@ -958,12 +886,78 @@ pipeline {
     stage('Pull Request Comment') {
       when {
         not {environment name: 'CHANGE_ID', value: ''}
-        environment name: 'CI', value: 'true'
         environment name: 'EXIT_STATUS', value: ''
       }
       steps {
-        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/issues/${PULL_REQUEST}/comments \
-        -d '{"body": "I am a bot, here are the test results for this PR: \\n'${CI_URL}' \\n'${SHELLCHECK_URL}'"}' '''
+        sh '''#! /bin/bash
+            # Function to retrieve JSON data from URL
+            get_json() {
+              local url="$1"
+              local response=$(curl -s "$url")
+              if [ $? -ne 0 ]; then
+                echo "Failed to retrieve JSON data from $url"
+                return 1
+              fi
+              local json=$(echo "$response" | jq .)
+              if [ $? -ne 0 ]; then
+                echo "Failed to parse JSON data from $url"
+                return 1
+              fi
+              echo "$json"
+            }
+
+            build_table() {
+              local data="$1"
+
+              # Get the keys in the JSON data
+              local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]')
+
+              # Check if keys are empty
+              if [ -z "$keys" ]; then
+                echo "JSON report data does not contain any keys or the report does not exist."
+                return 1
+              fi
+
+              # Build table header
+              local header="| Tag | Passed |\\n| --- | --- |\\n"
+
+              # Loop through the JSON data to build the table rows
+              local rows=""
+              for build in $keys; do
+                local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success")
+                if [ "$status" = "true" ]; then
+                  status="✅"
+                else
+                  status="❌"
+                fi
+                local row="| "$build" | "$status" |\\n"
+                rows="${rows}${row}"
+              done
+
+              local table="${header}${rows}"
+              local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g')
+              echo "$escaped_table"
+            }
+
+            if [[ "${CI}" = "true" ]]; then
+              # Retrieve JSON data from URL
+              data=$(get_json "$CI_JSON_URL")
+              # Create table from JSON data
+              table=$(build_table "$data")
+              echo -e "$table"
+
+              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
+                -H "Accept: application/vnd.github.v3+json" \
+                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
+                -d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
+            else
+              curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
+                -H "Accept: application/vnd.github.v3+json" \
+                "https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
+                -d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
+            fi
+            '''
+
       }
     }
   }
@@ -989,6 +983,14 @@ pipeline {
       }
     }
     cleanup {
+      sh '''#! /bin/bash
+            echo "Performing docker system prune!!"
+            containers=$(docker ps -aq)
+            if [[ -n "${containers}" ]]; then
+              docker stop ${containers}
+            fi
+            docker system prune -af --volumes || :
+         '''
       cleanWs()
     }
   }

README.md

@@ -56,7 +56,7 @@ The architectures supported by this image are:
 | :----: | :----: | ---- |
 | x86-64 | ✅ | amd64-\<version tag\> |
 | arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf | ✅ | arm32v7-\<version tag\> |
+| armhf | ❌ | |
 
 ## Version Tags
 
@@ -245,6 +245,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **06.06.23:** - Rebase master to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf).
 * **17.01.23:** - Rebase master branch to Alpine 3.17, migrate to s6v3.
 * **06.06.22:** - Rebase master branch to Alpine 3.15.
 * **20.02.22:** - Rebase develop branch to Alpine.

jenkins-vars.yml

@@ -6,6 +6,7 @@ custom_version_command: curl -sL https://radarr.servarr.com/v1/update/master/cha
 release_type: stable
 release_tag: latest
 ls_branch: master
+build_armhf: false
 repo_vars:
   - BUILD_VERSION_ARG = 'RADARR_RELEASE'
   - LS_USER = 'linuxserver'

package_versions.txt

@@ -1,45 +1,425 @@
-alpine-baselayout-3.4.0-r0
-alpine-baselayout-data-3.4.0-r0
-alpine-keys-2.4-r1
-alpine-release-3.17.2-r0
-apk-tools-2.12.10-r1
-bash-5.2.15-r0
-brotli-libs-1.0.9-r9
-busybox-1.35.0-r29
-busybox-binsh-1.35.0-r29
-ca-certificates-20220614-r4
-ca-certificates-bundle-20220614-r4
-coreutils-9.1-r0
-curl-7.87.0-r1
-icu-data-en-72.1-r1
-icu-libs-72.1-r1
-jq-1.6-r2
-libacl-2.3.1-r1
-libattr-2.5.1-r2
-libc-utils-0.7.2-r3
-libcrypto3-3.0.8-r0
-libcurl-7.87.0-r1
-libgcc-12.2.1_git20220924-r4
-libintl-0.21.1-r1
-libproc-3.3.17-r2
-libssl3-3.0.8-r0
-libstdc++-12.2.1_git20220924-r4
-linux-pam-1.5.2-r1
-musl-1.2.3-r4
-musl-utils-1.2.3-r4
-ncurses-libs-6.3_p20221119-r0
-ncurses-terminfo-base-6.3_p20221119-r0
-nghttp2-libs-1.51.0-r0
-oniguruma-6.9.8-r0
-procps-3.3.17-r2
-readline-8.2.0-r0
-scanelf-1.3.5-r1
-shadow-4.13-r0
-skalibs-2.12.0.1-r0
-sqlite-libs-3.40.1-r0
-ssl_client-1.35.0-r29
-tzdata-2022f-r1
-utmps-libs-0.1.2.0-r1
-xz-5.2.9-r0
-xz-libs-5.2.9-r0
-zlib-1.2.13-r0
+NAME                                                        VERSION                 TYPE   
+BouncyCastle.Crypto                                         1.9.0.1                 dotnet  
+Dapper                                                      2.0.123.33578           dotnet  
+DryIoc netstandard2.1                                       5.3.4.0                 dotnet  
+DryIoc.Microsoft.DependencyInjection netstandard2.0         6.1.1.0                 dotnet  
+Dynamitey                                                   2.0.9.136               dotnet  
+Equ                                                         2.3.0                   dotnet  
+FFMpegCore                                                  4.0.0.0                 dotnet  
+FluentMigrator                                              3.3.2.9                 dotnet  
+FluentMigrator.Abstractions                                 3.3.2.9                 dotnet  
+FluentMigrator.Extensions.Oracle                            3.3.2.9                 dotnet  
+FluentMigrator.Extensions.Postgres                          3.3.2.9                 dotnet  
+FluentMigrator.Extensions.SqlAnywhere                       3.3.2.9                 dotnet  
+FluentMigrator.Extensions.SqlServer                         3.3.2.9                 dotnet  
+FluentMigrator.Runner                                       3.3.2.9                 dotnet  
+FluentMigrator.Runner.Core                                  3.3.2.9                 dotnet  
+FluentMigrator.Runner.Db2                                   3.3.2.9                 dotnet  
+FluentMigrator.Runner.Firebird                              3.3.2.9                 dotnet  
+FluentMigrator.Runner.Hana                                  3.3.2.9                 dotnet  
+FluentMigrator.Runner.MySql                                 3.3.2.9                 dotnet  
+FluentMigrator.Runner.Oracle                                3.3.2.9                 dotnet  
+FluentMigrator.Runner.Postgres                              3.3.2.9                 dotnet  
+FluentMigrator.Runner.Redshift                              3.3.2.9                 dotnet  
+FluentMigrator.Runner.SQLite                                3.3.2.9                 dotnet  
+FluentMigrator.Runner.SqlAnywhere                           3.3.2.9                 dotnet  
+FluentMigrator.Runner.SqlServer                             3.3.2.9                 dotnet  
+FluentMigrator.Runner.SqlServerCe                           3.3.2.9                 dotnet  
+FluentValidation                                            9.5.4.0                 dotnet  
+ICSharpCode.SharpZipLib                                     1.3.3.11                dotnet  
+Ical.Net                                                    1.0.0.0                 dotnet  
+ImpromptuInterface                                          7.0.1.0                 dotnet  
+Instances                                                   1.0.0.0                 dotnet  
+Json.NET .NET 6.0                                           13.0.2.27524            dotnet  
+MailKit                                                     3.6.0.0                 dotnet  
+Microsoft.AspNetCore                                        6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Antiforgery                            6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Authentication                         6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Authentication.Abstractions            6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Authentication.Cookies                 6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Authentication.Core                    6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Authentication.OAuth                   6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Authorization                          6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Authorization.Policy                   6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Components                             6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Components.Authorization               6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Components.Forms                       6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Components.Server                      6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Components.Web                         6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Connections.Abstractions               6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.CookiePolicy                           6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Cors                                   6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Cryptography.Internal                  6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Cryptography.KeyDerivation             6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.DataProtection                         6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.DataProtection.Abstractions            6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.DataProtection.Extensions              6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Diagnostics                            6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Diagnostics.Abstractions               6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Diagnostics.HealthChecks               6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.HostFiltering                          6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Hosting                                6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Hosting.Abstractions                   6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Hosting.Server.Abstractions            6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Html.Abstractions                      6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Http                                   6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Http.Abstractions                      6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Http.Connections                       6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Http.Connections.Common                6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Http.Extensions                        6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Http.Features                          6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Http.Results                           6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.HttpLogging                            6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.HttpOverrides                          6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.HttpsPolicy                            6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Identity                               6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Localization                           6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Localization.Routing                   6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Metadata                               6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Mvc                                    6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Mvc.Abstractions                       6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Mvc.ApiExplorer                        6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Mvc.Core                               6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Mvc.Cors                               6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Mvc.DataAnnotations                    6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Mvc.Formatters.Json                    6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Mvc.Formatters.Xml                     6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Mvc.Localization                       6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Mvc.Razor                              6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Mvc.RazorPages                         6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Mvc.TagHelpers                         6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Mvc.ViewFeatures                       6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Razor                                  6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Razor.Runtime                          6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.ResponseCaching                        6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.ResponseCaching.Abstractions           6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.ResponseCompression                    6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Rewrite                                6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Routing                                6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Routing.Abstractions                   6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Server.HttpSys                         6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Server.IIS                             6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Server.IISIntegration                  6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Server.Kestrel                         6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Server.Kestrel.Core                    6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Server.Kestrel.Transport.Quic          6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets       6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.Session                                6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.SignalR                                6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.SignalR.Common                         6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.SignalR.Core                           6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.SignalR.Protocols.Json                 6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.StaticFiles                            6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.WebSockets                             6.0.1623.17406          dotnet  
+Microsoft.AspNetCore.WebUtilities                           6.0.1623.17406          dotnet  
+Microsoft.CSharp                                            6.0.1623.17311          dotnet  
+Microsoft.Data.SqlClient                                    2.0.20168.4             dotnet  
+Microsoft.Extensions.Caching.Abstractions                   6.0.21.52210            dotnet  
+Microsoft.Extensions.Caching.Memory                         6.0.222.6406            dotnet  
+Microsoft.Extensions.Configuration                          6.0.322.12309           dotnet  
+Microsoft.Extensions.Configuration.Abstractions             6.0.21.52210            dotnet  
+Microsoft.Extensions.Configuration.Binder                   6.0.21.52210            dotnet  
+Microsoft.Extensions.Configuration.CommandLine              6.0.21.52210            dotnet  
+Microsoft.Extensions.Configuration.EnvironmentVariables     6.0.222.6406            dotnet  
+Microsoft.Extensions.Configuration.FileExtensions           6.0.21.52210            dotnet  
+Microsoft.Extensions.Configuration.Ini                      6.0.21.52210            dotnet  
+Microsoft.Extensions.Configuration.Json                     6.0.21.52210            dotnet  
+Microsoft.Extensions.Configuration.KeyPerFile               6.0.1623.17406          dotnet  
+Microsoft.Extensions.Configuration.UserSecrets              6.0.222.6406            dotnet  
+Microsoft.Extensions.Configuration.Xml                      6.0.21.52210            dotnet  
+Microsoft.Extensions.DependencyInjection                    6.0.1022.47605          dotnet  
+Microsoft.Extensions.DependencyInjection.Abstractions       6.0.21.52210            dotnet  
+Microsoft.Extensions.Diagnostics.HealthChecks               6.0.1623.17406          dotnet  
+Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions  6.0.1623.17406          dotnet  
+Microsoft.Extensions.Features                               6.0.1623.17406          dotnet  
+Microsoft.Extensions.FileProviders.Abstractions             6.0.21.52210            dotnet  
+Microsoft.Extensions.FileProviders.Composite                6.0.21.52210            dotnet  
+Microsoft.Extensions.FileProviders.Embedded                 6.0.1623.17406          dotnet  
+Microsoft.Extensions.FileProviders.Physical                 6.0.21.52210            dotnet  
+Microsoft.Extensions.FileSystemGlobbing                     6.0.21.52210            dotnet  
+Microsoft.Extensions.Hosting                                6.0.222.6406            dotnet  
+Microsoft.Extensions.Hosting.Abstractions                   6.0.21.52210            dotnet  
+Microsoft.Extensions.Hosting.WindowsServices                6.0.1022.47605          dotnet  
+Microsoft.Extensions.Http                                   6.0.21.52210            dotnet  
+Microsoft.Extensions.Identity.Core                          6.0.1623.17406          dotnet  
+Microsoft.Extensions.Identity.Stores                        6.0.1623.17406          dotnet  
+Microsoft.Extensions.Localization                           6.0.1623.17406          dotnet  
+Microsoft.Extensions.Localization.Abstractions              6.0.1623.17406          dotnet  
+Microsoft.Extensions.Logging                                6.0.21.52210            dotnet  
+Microsoft.Extensions.Logging.Abstractions                   6.0.1122.52304          dotnet  
+Microsoft.Extensions.Logging.Configuration                  6.0.21.52210            dotnet  
+Microsoft.Extensions.Logging.Console                        6.0.21.52210            dotnet  
+Microsoft.Extensions.Logging.Debug                          6.0.21.52210            dotnet  
+Microsoft.Extensions.Logging.EventLog                       6.0.21.52210            dotnet  
+Microsoft.Extensions.Logging.EventSource                    6.0.21.52210            dotnet  
+Microsoft.Extensions.Logging.TraceSource                    6.0.21.52210            dotnet  
+Microsoft.Extensions.ObjectPool                             6.0.1623.17406          dotnet  
+Microsoft.Extensions.Options                                6.0.21.52210            dotnet  
+Microsoft.Extensions.Options.ConfigurationExtensions        6.0.21.52210            dotnet  
+Microsoft.Extensions.Options.DataAnnotations                6.0.21.52210            dotnet  
+Microsoft.Extensions.Primitives                             6.0.21.52210            dotnet  
+Microsoft.Extensions.WebEncoders                            6.0.1623.17406          dotnet  
+Microsoft.Identity.Client                                   4.21.1.0                dotnet  
+Microsoft.IdentityModel.JsonWebTokens                       6.8.0.11012             dotnet  
+Microsoft.IdentityModel.Logging                             6.8.0.11012             dotnet  
+Microsoft.IdentityModel.Protocols                           6.8.0.11012             dotnet  
+Microsoft.IdentityModel.Protocols.OpenIdConnect             6.8.0.11012             dotnet  
+Microsoft.IdentityModel.Tokens                              6.8.0.11012             dotnet  
+Microsoft.JSInterop                                         6.0.1623.17406          dotnet  
+Microsoft.Net.Http.Headers                                  6.0.1623.17406          dotnet  
+Microsoft.OpenApi                                           1.2.3.0                 dotnet  
+Microsoft.VisualBasic                                       6.0.1623.17311          dotnet  
+Microsoft.VisualBasic.Core                                  11.100.1623.17311       dotnet  
+Microsoft.Win32.Primitives                                  6.0.1623.17311          dotnet  
+Microsoft.Win32.Registry                                    6.0.1623.17311          dotnet  
+Microsoft.Win32.SystemEvents                                6.0.21.52210            dotnet  
+MimeKit                                                     3.6.0.0                 dotnet  
+Mono.Nat                                                    3.0.1                   dotnet  
+Mono.Posix.NETStandard.dll                                  1.0.0.0                 dotnet  
+MonoTorrent                                                 2.0.7                   dotnet  
+NLog Syslog target                                          7.0.0.0                 dotnet  
+NLog for NetStandard 2.0                                    5.2.0.1813              dotnet  
+NLog.Extensions.Logging for .NET 6                          5.3.0.360               dotnet  
+Noda Time                                                   3.0.0.0                 dotnet  
+Npgsql                                                      7.0.4.0                 dotnet  
+Polly.Contrib.WaitAndRetry                                  1.1.1.0                 dotnet  
+Radarr                                                      4.7.5.7809              dotnet  
+Radarr.Api.V3                                               4.7.5.7809              dotnet  
+Radarr.Common                                               4.7.5.7809              dotnet  
+Radarr.Core                                                 4.7.5.7809              dotnet  
+Radarr.Host                                                 4.7.5.7809              dotnet  
+Radarr.Http                                                 4.7.5.7809              dotnet  
+Radarr.Mono                                                 4.7.5.7809              dotnet  
+Radarr.SignalR                                              4.7.5.7809              dotnet  
+ReusableTasks                                               2.0.0                   dotnet  
+Sentry                                                      3.23.1.0                dotnet  
+SixLabors.ImageSharp                                        3.0.1.0                 dotnet  
+Swashbuckle.AspNetCore.Swagger                              6.5.0.0                 dotnet  
+Swashbuckle.AspNetCore.SwaggerGen                           6.5.0.0                 dotnet  
+System                                                      6.0.1623.17311          dotnet  
+System.AppContext                                           6.0.1623.17311          dotnet  
+System.Buffers                                              6.0.1623.17311          dotnet  
+System.Collections                                          6.0.1623.17311          dotnet  
+System.Collections.Concurrent                               6.0.1623.17311          dotnet  
+System.Collections.Immutable                                6.0.1623.17311          dotnet  
+System.Collections.NonGeneric                               6.0.1623.17311          dotnet  
+System.Collections.Specialized                              6.0.1623.17311          dotnet  
+System.ComponentModel                                       6.0.1623.17311          dotnet  
+System.ComponentModel.Annotations                           6.0.1623.17311          dotnet  
+System.ComponentModel.DataAnnotations                       6.0.1623.17311          dotnet  
+System.ComponentModel.EventBasedAsync                       6.0.1623.17311          dotnet  
+System.ComponentModel.Primitives                            6.0.1623.17311          dotnet  
+System.ComponentModel.TypeConverter                         6.0.1623.17311          dotnet  
+System.Configuration                                        6.0.1623.17311          dotnet  
+System.Configuration.ConfigurationManager                   6.0.922.41905           dotnet  
+System.Console                                              6.0.1623.17311          dotnet  
+System.Core                                                 6.0.1623.17311          dotnet  
+System.Data                                                 6.0.1623.17311          dotnet  
+System.Data.Common                                          6.0.1623.17311          dotnet  
+System.Data.DataSetExtensions                               6.0.1623.17311          dotnet  
+System.Data.SQLite Core                                     1.0.115.5               dotnet  
+System.Data.SqlServerCe                                     4.0.8876.1              dotnet  
+System.Diagnostics.Contracts                                6.0.1623.17311          dotnet  
+System.Diagnostics.Debug                                    6.0.1623.17311          dotnet  
+System.Diagnostics.DiagnosticSource                         6.0.1623.17311          dotnet  
+System.Diagnostics.EventLog                                 6.0.21.52210            dotnet  
+System.Diagnostics.FileVersionInfo                          6.0.1623.17311          dotnet  
+System.Diagnostics.Process                                  6.0.1623.17311          dotnet  
+System.Diagnostics.StackTrace                               6.0.1623.17311          dotnet  
+System.Diagnostics.TextWriterTraceListener                  6.0.1623.17311          dotnet  
+System.Diagnostics.Tools                                    6.0.1623.17311          dotnet  
+System.Diagnostics.TraceSource                              6.0.1623.17311          dotnet  
+System.Diagnostics.Tracing                                  6.0.1623.17311          dotnet  
+System.Drawing                                              6.0.1623.17311          dotnet  
+System.Drawing.Common                                       6.0.21.52210            dotnet  
+System.Drawing.Primitives                                   6.0.1623.17311          dotnet  
+System.Dynamic.Runtime                                      6.0.1623.17311          dotnet  
+System.Formats.Asn1                                         6.0.1623.17311          dotnet  
+System.Globalization                                        6.0.1623.17311          dotnet  
+System.Globalization.Calendars                              6.0.1623.17311          dotnet  
+System.Globalization.Extensions                             6.0.1623.17311          dotnet  
+System.IO                                                   6.0.1623.17311          dotnet  
+System.IO.Compression                                       6.0.1623.17311          dotnet  
+System.IO.Compression.Brotli                                6.0.1623.17311          dotnet  
+System.IO.Compression.FileSystem                            6.0.1623.17311          dotnet  
+System.IO.Compression.ZipFile                               6.0.1623.17311          dotnet  
+System.IO.FileSystem                                        6.0.1623.17311          dotnet  
+System.IO.FileSystem.AccessControl                          6.0.1623.17311          dotnet  
+System.IO.FileSystem.DriveInfo                              6.0.1623.17311          dotnet  
+System.IO.FileSystem.Primitives                             6.0.1623.17311          dotnet  
+System.IO.FileSystem.Watcher                                6.0.1623.17311          dotnet  
+System.IO.IsolatedStorage                                   6.0.1623.17311          dotnet  
+System.IO.MemoryMappedFiles                                 6.0.1623.17311          dotnet  
+System.IO.Pipelines                                         6.0.522.21309           dotnet  
+System.IO.Pipes                                             6.0.1623.17311          dotnet  
+System.IO.Pipes.AccessControl                               6.0.1623.17311          dotnet  
+System.IO.UnmanagedMemoryStream                             6.0.1623.17311          dotnet  
+System.IdentityModel.Tokens.Jwt                             6.8.0.11012             dotnet  
+System.Linq                                                 6.0.1623.17311          dotnet  
+System.Linq.Expressions                                     6.0.1623.17311          dotnet  
+System.Linq.Parallel                                        6.0.1623.17311          dotnet  
+System.Linq.Queryable                                       6.0.1623.17311          dotnet  
+System.Memory                                               6.0.1623.17311          dotnet  
+System.Net                                                  6.0.1623.17311          dotnet  
+System.Net.Http                                             6.0.1623.17311          dotnet  
+System.Net.Http.Json                                        6.0.1623.17311          dotnet  
+System.Net.HttpListener                                     6.0.1623.17311          dotnet  
+System.Net.Mail                                             6.0.1623.17311          dotnet  
+System.Net.NameResolution                                   6.0.1623.17311          dotnet  
+System.Net.NetworkInformation                               6.0.1623.17311          dotnet  
+System.Net.Ping                                             6.0.1623.17311          dotnet  
+System.Net.Primitives                                       6.0.1623.17311          dotnet  
+System.Net.Quic                                             6.0.1623.17311          dotnet  
+System.Net.Requests                                         6.0.1623.17311          dotnet  
+System.Net.Security                                         6.0.1623.17311          dotnet  
+System.Net.ServicePoint                                     6.0.1623.17311          dotnet  
+System.Net.Sockets                                          6.0.1623.17311          dotnet  
+System.Net.WebClient                                        6.0.1623.17311          dotnet  
+System.Net.WebHeaderCollection                              6.0.1623.17311          dotnet  
+System.Net.WebProxy                                         6.0.1623.17311          dotnet  
+System.Net.WebSockets                                       6.0.1623.17311          dotnet  
+System.Net.WebSockets.Client                                6.0.1623.17311          dotnet  
+System.Numerics                                             6.0.1623.17311          dotnet  
+System.Numerics.Vectors                                     6.0.1623.17311          dotnet  
+System.ObjectModel                                          6.0.1623.17311          dotnet  
+System.Private.CoreLib                                      6.0.1623.17311          dotnet  
+System.Private.DataContractSerialization                    6.0.1623.17311          dotnet  
+System.Private.Uri                                          6.0.1623.17311          dotnet  
+System.Private.Xml                                          6.0.1623.17311          dotnet  
+System.Private.Xml.Linq                                     6.0.1623.17311          dotnet  
+System.Reflection                                           6.0.1623.17311          dotnet  
+System.Reflection.DispatchProxy                             6.0.1623.17311          dotnet  
+System.Reflection.Emit                                      6.0.1623.17311          dotnet  
+System.Reflection.Emit.ILGeneration                         6.0.1623.17311          dotnet  
+System.Reflection.Emit.Lightweight                          6.0.1623.17311          dotnet  
+System.Reflection.Extensions                                6.0.1623.17311          dotnet  
+System.Reflection.Metadata                                  6.0.1623.17311          dotnet  
+System.Reflection.Primitives                                6.0.1623.17311          dotnet  
+System.Reflection.TypeExtensions                            6.0.1623.17311          dotnet  
+System.Resources.Reader                                     6.0.1623.17311          dotnet  
+System.Resources.ResourceManager                            6.0.1623.17311          dotnet  
+System.Resources.Writer                                     6.0.1623.17311          dotnet  
+System.Runtime                                              6.0.1623.17311          dotnet  
+System.Runtime.Caching                                      4.700.19.56404          dotnet  
+System.Runtime.CompilerServices.VisualC                     6.0.1623.17311          dotnet  
+System.Runtime.Extensions                                   6.0.1623.17311          dotnet  
+System.Runtime.Handles                                      6.0.1623.17311          dotnet  
+System.Runtime.InteropServices                              6.0.1623.17311          dotnet  
+System.Runtime.InteropServices.RuntimeInformation           6.0.1623.17311          dotnet  
+System.Runtime.Intrinsics                                   6.0.1623.17311          dotnet  
+System.Runtime.Loader                                       6.0.1623.17311          dotnet  
+System.Runtime.Numerics                                     6.0.1623.17311          dotnet  
+System.Runtime.Serialization                                6.0.1623.17311          dotnet  
+System.Runtime.Serialization.Formatters                     6.0.1623.17311          dotnet  
+System.Runtime.Serialization.Json                           6.0.1623.17311          dotnet  
+System.Runtime.Serialization.Primitives                     6.0.1623.17311          dotnet  
+System.Runtime.Serialization.Xml                            6.0.1623.17311          dotnet  
+System.Security                                             6.0.1623.17311          dotnet  
+System.Security.AccessControl                               6.0.1623.17311          dotnet  
+System.Security.Claims                                      6.0.1623.17311          dotnet  
+System.Security.Cryptography.Algorithms                     6.0.1623.17311          dotnet  
+System.Security.Cryptography.Cng                            6.0.1623.17311          dotnet  
+System.Security.Cryptography.Csp                            6.0.1623.17311          dotnet  
+System.Security.Cryptography.Encoding                       6.0.1623.17311          dotnet  
+System.Security.Cryptography.OpenSsl                        6.0.1623.17311          dotnet  
+System.Security.Cryptography.Pkcs                           6.0.1423.7309           dotnet  
+System.Security.Cryptography.Primitives                     6.0.1623.17311          dotnet  
+System.Security.Cryptography.ProtectedData                  6.0.21.52210            dotnet  
+System.Security.Cryptography.X509Certificates               6.0.1623.17311          dotnet  
+System.Security.Cryptography.Xml                            6.0.822.36306           dotnet  
+System.Security.Permissions                                 6.0.21.52210            dotnet  
+System.Security.Principal                                   6.0.1623.17311          dotnet  
+System.Security.Principal.Windows                           6.0.1623.17311          dotnet  
+System.Security.SecureString                                6.0.1623.17311          dotnet  
+System.ServiceModel.Web                                     6.0.1623.17311          dotnet  
+System.ServiceProcess                                       6.0.1623.17311          dotnet  
+System.ServiceProcess.ServiceController                     6.0.21.52210            dotnet  
+System.Text.Encoding                                        6.0.1623.17311          dotnet  
+System.Text.Encoding.CodePages                              6.0.1623.17311          dotnet  
+System.Text.Encoding.Extensions                             6.0.1623.17311          dotnet  
+System.Text.Encodings.Web                                   6.0.1623.17311          dotnet  
+System.Text.Json                                            6.0.1623.17311          dotnet  
+System.Text.RegularExpressions                              6.0.1623.17311          dotnet  
+System.Threading                                            6.0.1623.17311          dotnet  
+System.Threading.Channels                                   6.0.1623.17311          dotnet  
+System.Threading.Overlapped                                 6.0.1623.17311          dotnet  
+System.Threading.Tasks                                      6.0.1623.17311          dotnet  
+System.Threading.Tasks.Dataflow                             6.0.1623.17311          dotnet  
+System.Threading.Tasks.Extensions                           6.0.1623.17311          dotnet  
+System.Threading.Tasks.Parallel                             6.0.1623.17311          dotnet  
+System.Threading.Thread                                     6.0.1623.17311          dotnet  
+System.Threading.ThreadPool                                 6.0.1623.17311          dotnet  
+System.Threading.Timer                                      6.0.1623.17311          dotnet  
+System.Transactions                                         6.0.1623.17311          dotnet  
+System.Transactions.Local                                   6.0.1623.17311          dotnet  
+System.ValueTuple                                           6.0.1623.17311          dotnet  
+System.Web                                                  6.0.1623.17311          dotnet  
+System.Web.HttpUtility                                      6.0.1623.17311          dotnet  
+System.Windows                                              6.0.1623.17311          dotnet  
+System.Windows.Extensions                                   6.0.21.52210            dotnet  
+System.Xml                                                  6.0.1623.17311          dotnet  
+System.Xml.Linq                                             6.0.1623.17311          dotnet  
+System.Xml.ReaderWriter                                     6.0.1623.17311          dotnet  
+System.Xml.Serialization                                    6.0.1623.17311          dotnet  
+System.Xml.XDocument                                        6.0.1623.17311          dotnet  
+System.Xml.XPath                                            6.0.1623.17311          dotnet  
+System.Xml.XPath.XDocument                                  6.0.1623.17311          dotnet  
+System.Xml.XmlDocument                                      6.0.1623.17311          dotnet  
+System.Xml.XmlSerializer                                    6.0.1623.17311          dotnet  
+WindowsBase                                                 6.0.1623.17311          dotnet  
+alpine-baselayout                                           3.4.3-r1                apk     
+alpine-baselayout-data                                      3.4.3-r1                apk     
+alpine-keys                                                 2.4-r1                  apk     
+alpine-release                                              3.18.3-r0               apk     
+apk-tools                                                   2.14.0-r2               apk     
+bash                                                        5.2.15-r5               apk     
+brotli-libs                                                 1.0.9-r14               apk     
+busybox                                                     1.36.1-r2               apk     
+busybox-binsh                                               1.36.1-r2               apk     
+ca-certificates                                             20230506-r0             apk     
+ca-certificates-bundle                                      20230506-r0             apk     
+coreutils                                                   9.3-r1                  apk     
+curl                                                        8.3.0-r0                apk     
+icu-data-en                                                 73.2-r2                 apk     
+icu-libs                                                    73.2-r2                 apk     
+jq                                                          1.6-r3                  apk     
+libacl                                                      2.3.1-r3                apk     
+libattr                                                     2.5.1-r4                apk     
+libbsd                                                      0.11.7-r1               apk     
+libc-utils                                                  0.7.2-r5                apk     
+libcrypto3                                                  3.1.3-r0                apk     
+libcurl                                                     8.3.0-r0                apk     
+libgcc                                                      12.2.1_git20220924-r10  apk     
+libgcrypt                                                   1.10.2-r1               apk     
+libgpg-error                                                1.47-r1                 apk     
+libidn2                                                     2.3.4-r1                apk     
+libintl                                                     0.21.1-r7               apk     
+libmd                                                       1.0.4-r2                apk     
+libncursesw                                                 6.4_p20230506-r0        apk     
+libproc2                                                    4.0.4-r0                apk     
+libssl3                                                     3.1.3-r0                apk     
+libstdc++                                                   12.2.1_git20220924-r10  apk     
+libunistring                                                1.1-r1                  apk     
+libxml2                                                     2.11.4-r0               apk     
+libxslt                                                     1.1.38-r0               apk     
+linux-pam                                                   1.5.2-r10               apk     
+mscorlib                                                    6.0.1623.17311          dotnet  
+musl                                                        1.2.4-r1                apk     
+musl-utils                                                  1.2.4-r1                apk     
+ncurses-terminfo-base                                       6.4_p20230506-r0        apk     
+netcat-openbsd                                              1.219-r1                apk     
+netstandard                                                 6.0.1623.17311          dotnet  
+nghttp2-libs                                                1.55.1-r0               apk     
+oniguruma                                                   6.9.8-r1                apk     
+procps-ng                                                   4.0.4-r0                apk     
+readline                                                    8.2.1-r1                apk     
+scanelf                                                     1.3.7-r1                apk     
+shadow                                                      4.13-r4                 apk     
+skalibs                                                     2.13.1.1-r1             apk     
+sqlite-libs                                                 3.41.2-r2               apk     
+ssl_client                                                  1.36.1-r2               apk     
+tzdata                                                      2023c-r1                apk     
+utmps-libs                                                  0.1.2.1-r1              apk     
+xmlstarlet                                                  1.6.1-r2                apk     
+xz-libs                                                     5.4.3-r0                apk     
+zlib                                                        1.2.13-r1               apk     

readme-vars.yml

@@ -12,7 +12,6 @@ project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_
 available_architectures:
   - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
   - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-  - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
 
 # development version
 development_versions: true
@@ -56,6 +55,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "06.06.23:", desc: "Rebase master to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)." }
   - { date: "17.01.23:", desc: "Rebase master branch to Alpine 3.17, migrate to s6v3." }
   - { date: "06.06.22:", desc: "Rebase master branch to Alpine 3.15." }
   - { date: "20.02.22:", desc: "Rebase develop branch to Alpine." }

root/etc/s6-overlay/s6-rc.d/svc-radarr/data/check

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+PORT=$(xmlstarlet sel -T -t -v /Config/Port /config/config.xml)
+
+if [[ $(curl -sL "http://localhost:${PORT:-7878}/ping" | jq -r '.status' 2>/dev/null) = "OK" ]]; then
+    exit 0
+else
+    exit 1
+fi

root/etc/s6-overlay/s6-rc.d/svc-radarr/run

@@ -2,6 +2,6 @@
 # shellcheck shell=bash
 
 exec \
-    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 7878" \
+    s6-notifyoncheck -d -n 300 -w 1000 \
         cd /app/radarr/bin s6-setuidgid abc /app/radarr/bin/Radarr \
         -nobrowser -data=/config