Bot Updating Package Versions

Merge pull request #208 from linuxserver/develop-3.18
2023-06-18 16:56:22 +00:00 · 2023-06-14 08:05:00 +00:00 · 2023-06-14 09:01:33 +01:00 · 2023-06-06 15:22:08 +01:00 · 2023-06-04 16:46:43 +00:00 · 2023-05-28 15:40:08 +00:00
36 changed files with 700 additions and 419 deletions
@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
 indent_style = space
 indent_size = 2

-[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
+[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
 indent_style = space
 indent_size = 4
@@ -1,40 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-
---
-[linuxserverurl]: https://linuxserver.io
-[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
-
-<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
-
-<!--- Provide a general summary of the bug in the Title above -->
-
------------------------------
-
-## Expected Behavior
-<!--- Tell us what should happen -->
-
-## Current Behavior
-<!--- Tell us what happens instead of the expected behavior -->
-
-## Steps to Reproduce
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-1.
-2.
-3.
-4.
-
-## Environment
-**OS:**
-**CPU architecture:** x86_64/arm32/arm64
-**How docker service was installed:**
-<!--- ie. from the official docker repo, from the distro repo, nas OS provided, etc. -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Command used to create docker container (run/create/compose/screenshot)
-<!--- Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container -->
-
-## Docker logs
-<!--- Provide a full docker log, output of "docker logs radarr" -->
@@ -0,0 +1,76 @@
+# Based on the issue template
+name: Bug report
+description: Create a report to help us improve
+title: "[BUG] <title>"
+labels: [Bug]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is there an existing issue for this?
+      description: Please search to see if an issue already exists for the bug you encountered.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: textarea
+    attributes:
+      label: Current Behavior
+      description: Tell us what happens instead of the expected behavior.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behavior
+      description: Tell us what should happen.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Steps To Reproduce
+      description: Steps to reproduce the behavior.
+      placeholder: |
+        1. In this environment...
+        2. With this config...
+        3. Run '...'
+        4. See error...
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        examples:
+          - **OS**: Ubuntu 20.04
+          - **How docker service was installed**: distro's packagemanager
+      value: |
+        - OS:
+        - How docker service was installed:
+      render: markdown
+    validations:
+      required: false
+  - type: dropdown
+    attributes:
+      label: CPU architecture
+      options:
+        - x86-64
+        - arm64
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Docker creation
+      description: |
+        Command used to create docker container
+        Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container
+      render: bash
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      description: |
+        Provide a full docker log, output of "docker logs linuxserver.io"
+      label: Container logs
+      placeholder: |
+        Output of `docker logs linuxserver.io`
+      render: bash
+    validations:
+      required: true
@@ -1,25 +0,0 @@
---
-name: Feature request
-about: Suggest an idea for this project
-
---
-[linuxserverurl]: https://linuxserver.io
-[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
-
-<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
-
-<!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
-<!--- If this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script  https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
-
-<!--- Provide a general summary of the request in the Title above -->
-
------------------------------
-
-## Desired Behavior
-<!--- Tell us what should happen -->
-
-## Current Behavior
-<!--- Tell us what happens instead of the expected behavior -->
-
-## Alternatives Considered
-<!--- Tell us what other options you have tried or considered -->
@@ -0,0 +1,31 @@
+# Based on the issue template
+name: Feature request
+description: Suggest an idea for this project
+title: "[FEAT] <title>"
+labels: [enhancement]
+body:
+  - type: checkboxes
+    attributes:
+      label: Is this a new feature request?
+      description: Please search to see if a feature request already exists.
+      options:
+        - label: I have searched the existing issues
+          required: true
+  - type: textarea
+    attributes:
+      label: Wanted change
+      description: Tell us what you want to happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Reason for change
+      description: Justify your request, why do you want it, what is the benefit.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Proposed code change
+      description: Do you have a potential code change in mind?
+    validations:
+      required: false
@@ -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
@@ -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
@@ -7,16 +7,18 @@ jobs:
  external-trigger-develop:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0

      - name: External Trigger
        if: github.ref == 'refs/heads/develop'
        run: |
          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_RADARR_DEVELOP }}" ]; then
            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_RADARR_DEVELOP is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_EXTERNAL_TRIGGER_RADARR_DEVELOP\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY
            exit 0
          fi
          echo "**** External trigger running off of develop branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_RADARR_DEVELOP\". ****"
+          echo "External trigger running off of develop branch. To disable this trigger, set a Github secret named \`PAUSE_EXTERNAL_TRIGGER_RADARR_DEVELOP\`" >> $GITHUB_STEP_SUMMARY
          echo "**** Retrieving external version ****"
          EXT_RELEASE=$(curl -sL https://radarr.servarr.com/v1/update/develop/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="develop"
@@ -48,8 +51,12 @@ jobs:
              | jq -r '.config.digest')
          image_info=$(curl -sL \
            --header "Authorization: Bearer ${token}" \
-            "https://ghcr.io/v2/${image}/blobs/${digest}" \
-            | jq -r '.container_config')
+            "https://ghcr.io/v2/${image}/blobs/${digest}")
+          if [[ $(echo $image_info | jq -r '.container_config') == "null" ]]; then
+            image_info=$(echo $image_info | jq -r '.config')
+          else
+            image_info=$(echo $image_info | jq -r '.container_config')
+          fi
          IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
          IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
          if [ -z "${IMAGE_VERSION}" ]; then
@@ -61,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/develop/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/develop/buildWithParameters?PACKAGE_CHECK=false \
              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
@@ -78,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" \
@@ -2,14 +2,14 @@ name: External Trigger Scheduler

 on:
  schedule:
-    - cron:  '51 * * * *'
+    - cron:  '25 * * * *'
  workflow_dispatch:

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

@@ -17,18 +17,18 @@ jobs:
        run: |
          echo "**** Branches found: ****"
          git for-each-ref --format='%(refname:short)' refs/remotes
-          echo "**** Pulling the yq docker image ****"
-          docker pull ghcr.io/linuxserver/yq
          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
          do
            br=$(echo "$br" | sed 's|origin/||g')
            echo "**** Evaluating branch ${br} ****"
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-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
@@ -8,6 +8,6 @@ jobs:
    steps:
    - uses: actions/first-interaction@v1
      with:
-        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-radarr/blob/develop/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-radarr/blob/develop/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
+        issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.'
        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-radarr/blob/develop/.github/PULL_REQUEST_TEMPLATE.md)!'
        repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -7,20 +7,23 @@ jobs:
  package-trigger-develop:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2.3.3
+      - uses: actions/checkout@v3.1.0

      - name: Package Trigger
        if: github.ref == 'refs/heads/develop'
        run: |
          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_RADARR_DEVELOP }}" ]; then
            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_RADARR_DEVELOP is set; skipping trigger. ****"
+            echo "Github secret \`PAUSE_PACKAGE_TRIGGER_RADARR_DEVELOP\` 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/develop/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 develop branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_RADARR_DEVELOP\". ****"
+          echo "Package trigger running off of develop branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_RADARR_DEVELOP\`" >> $GITHUB_STEP_SUMMARY
          response=$(curl -iX POST \
            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-radarr/job/develop/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" \
@@ -2,14 +2,14 @@ name: Package Trigger Scheduler

 on:
  schedule:
-    - cron:  '53 15 * * 1'
+    - cron:  '49 16 * * 0'
  workflow_dispatch:

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

@@ -17,18 +17,16 @@ jobs:
        run: |
          echo "**** Branches found: ****"
          git for-each-ref --format='%(refname:short)' refs/remotes
-          echo "**** Pulling the yq docker image ****"
-          docker pull ghcr.io/linuxserver/yq
          for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
          do
            br=$(echo "$br" | sed 's|origin/||g')
            echo "**** Evaluating branch ${br} ****"
-            ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-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} ****"
@@ -0,0 +1,10 @@
+name: Permission check
+on:
+  pull_request_target:
+    paths:
+      - '**/run'
+      - '**/finish'
+      - '**/check'
+jobs:
+  permission_check:
+    uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1
@@ -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@v3
-      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 }}
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.18

 # set version label
 ARG BUILD_DATE
@@ -14,10 +16,9 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 RUN \
  echo "**** install packages ****" && \
  apk add -U --upgrade --no-cache \
-    curl \
-    jq \
    icu-libs \
-    sqlite-libs && \
+    sqlite-libs \
+    xmlstarlet && \
  echo "**** install radarr ****" && \
  mkdir -p /app/radarr/bin && \
  if [ -z ${RADARR_RELEASE+x} ]; then \
@@ -30,16 +31,16 @@ RUN \
  tar xzf \
    /tmp/radarr.tar.gz -C \
    /app/radarr/bin --strip-components=1 && \
-  echo -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)\nPackageGlobalMessage=Warn: This image is now based on Alpine. Custom scripts using apt-get will need to be updated to use apk" > /app/radarr/package_info && \
+  echo -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/radarr/package_info && \
  echo "**** cleanup ****" && \
  rm -rf \
    /app/radarr/bin/Radarr.Update \
-    /tmp/* \
-    /var/tmp/*
+    /tmp/*

 # copy local files
 COPY root/ /

 # ports and volumes
 EXPOSE 7878
+
 VOLUME /config
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18

 # set version label
 ARG BUILD_DATE
@@ -14,10 +16,9 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 RUN \
  echo "**** install packages ****" && \
  apk add -U --upgrade --no-cache \
-    curl \
-    jq \
    icu-libs \
-    sqlite-libs && \
+    sqlite-libs \
+    xmlstarlet && \
  echo "**** install radarr ****" && \
  mkdir -p /app/radarr/bin && \
  if [ -z ${RADARR_RELEASE+x} ]; then \
@@ -30,16 +31,16 @@ RUN \
  tar xzf \
    /tmp/radarr.tar.gz -C \
    /app/radarr/bin --strip-components=1 && \
-  echo -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)\nPackageGlobalMessage=Warn: This image is now based on Alpine. Custom scripts using apt-get will need to be updated to use apk" > /app/radarr/package_info && \
+  echo -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > /app/radarr/package_info && \
  echo "**** cleanup ****" && \
  rm -rf \
    /app/radarr/bin/Radarr.Update \
-    /tmp/* \
-    /var/tmp/*
+    /tmp/*

 # copy local files
 COPY root/ /

 # ports and volumes
 EXPOSE 7878
+
 VOLUME /config
@@ -1,45 +0,0 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
-
-# set version label
-ARG BUILD_DATE
-ARG VERSION
-ARG RADARR_RELEASE
-LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="Roxedus,thespad"
-
-# environment settings
-ARG RADARR_BRANCH="develop"
-ENV XDG_CONFIG_HOME="/config/xdg"
-
-RUN \
-  echo "**** install packages ****" && \
-  apk add -U --upgrade --no-cache \
-    curl \
-    jq \
-    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 -e "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)\nPackageGlobalMessage=Warn: This image is now based on Alpine. Custom scripts using apt-get will need to be updated to use apk" > /app/radarr/package_info && \
-  echo "**** cleanup ****" && \
-  rm -rf \
-    /app/radarr/bin/Radarr.Update \
-    /tmp/* \
-    /var/tmp/*
-
-# copy local files
-COPY root/ /
-
-# ports and volumes
-EXPOSE 7878
-VOLUME /config
@@ -33,16 +33,22 @@ pipeline {
    CI_DELAY='120'
    CI_DOCKERENV='TZ=US/Pacific'
    CI_AUTH='user:password'
-    CI_WEBPATH=''
+    CI_WEBPATH='/system/status'
  }
  stages {
    // 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}':develop 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}:develop 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.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./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(
@@ -66,7 +72,7 @@ pipeline {
        script{
          env.LS_TAG_NUMBER = sh(
            script: '''#! /bin/bash
-                       tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
+                       tagsha=$(git rev-list -n 1 develop-${LS_RELEASE} 2>/dev/null)
                       if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
                         echo ${LS_RELEASE_NUMBER}
                       elif [ -z "${GIT_COMMIT}" ]; then
@@ -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-develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'amd64-develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          } else {
            env.CI_TAGS = 'develop-' + 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-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+            env.CI_TAGS = 'amd64-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          } else {
            env.CI_TAGS = 'develop-' + 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-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'amd64-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
          } else {
-            env.CI_TAGS = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'develop-' + 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 = 'develop-' + 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 = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
          env.EXT_RELEASE_TAG = 'develop-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"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
              for i in ${OLD_TEMPLATES}; do
                if [[ -f "${i}" ]]; then
                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -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
@@ -339,13 +342,17 @@ 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/
                if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
-                  echo "Image is on the ignore list, removing Unraid template"
-                  git rm unraid/${CONTAINER_NAME}.xml || :
-                  git commit -m 'Bot Removing Deprecated Unraid Template' || :
+                  echo "Image is on the ignore list, marking Unraid template as deprecated"
+                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
+                  git add -u unraid/${CONTAINER_NAME}.xml
+                  git mv unraid/${CONTAINER_NAME}.xml unraid/deprecated/${CONTAINER_NAME}.xml || :
+                  git commit -m 'Bot Moving Deprecated Unraid Template' || :
                else
                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                  git add unraid/${CONTAINER_NAME}.xml
@@ -377,6 +384,26 @@ pipeline {
        }
      }
    }
+    // If this is a develop build check the S6 service file perms
+    stage("Check S6 Service file Permissions"){
+      when {
+        branch "develop"
+        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
       ####################### */
@@ -408,8 +435,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 \
@@ -440,7 +466,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\" \
@@ -453,7 +480,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} ."
      }
    }
@@ -470,7 +497,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\" \
@@ -483,44 +511,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'
@@ -531,7 +525,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\" \
@@ -544,15 +539,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 || : '''
          }
        }
      }
@@ -573,26 +571,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
@@ -627,13 +611,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'
        }
@@ -651,13 +628,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'
        }
@@ -679,14 +649,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 \
@@ -705,10 +674,8 @@ 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 \
-                python /ci/ci.py'''
+                python3 test_build.py'''
        }
      }
    }
@@ -759,17 +726,6 @@ pipeline {
                  done
               '''
          }
-          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
-                  docker rmi \
-                  ${DELETEIMAGE}:${META_TAG} \
-                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:develop || :
-                  if [ -n "${SEMVER}" ]; then
-                    docker rmi ${DELETEIMAGE}:${SEMVER} || :
-                  fi
-                done
-             '''
        }
      }
    }
@@ -802,58 +758,54 @@ 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 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
                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
                    docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-develop
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-develop
-                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-develop
                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    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-develop
                    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}:arm32v7-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-develop
-                    docker push ${MANIFESTIMAGE}:arm32v7-develop
-                    docker push ${MANIFESTIMAGE}:arm64v8-develop
                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:amd64-develop
+                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
+                    docker push ${MANIFESTIMAGE}:arm64v8-develop
                    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}:develop || :
-                    docker manifest create ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:amd64-develop ${MANIFESTIMAGE}:arm32v7-develop ${MANIFESTIMAGE}:arm64v8-develop
-                    docker manifest annotate ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:arm32v7-develop --os linux --arch arm
+                    docker manifest create ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:amd64-develop ${MANIFESTIMAGE}:arm64v8-develop
                    docker manifest annotate ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:arm64v8-develop --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-develop")
+                    if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
+                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-develop || :
+                      docker manifest create ${MANIFESTIMAGE}:arm32v7-develop ${MANIFESTIMAGE}:amd64-develop
+                      docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-develop
+                    fi
                    docker manifest push --purge ${MANIFESTIMAGE}:develop
                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
@@ -863,29 +815,6 @@ pipeline {
                  done
               '''
          }
-          sh '''#! /bin/bash
-                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
-                  docker rmi \
-                  ${DELETEIMAGE}:amd64-${META_TAG} \
-                  ${DELETEIMAGE}:amd64-develop \
-                  ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
-                  ${DELETEIMAGE}:arm32v7-develop \
-                  ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
-                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
-                  ${DELETEIMAGE}:arm64v8-develop \
-                  ${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} || :
-             '''
        }
      }
    }
@@ -956,12 +885,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
+            '''
+
      }
    }
  }
@@ -975,18 +970,26 @@ pipeline {
          sh 'echo "build aborted"'
        }
        else if (currentBuild.currentResult == "SUCCESS"){
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 1681177,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\
                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
        }
        else {
-          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://wiki.jenkins-ci.org/download/attachments/2916393/headshot.png","embeds": [{"color": 16711680,\
+          sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
                 "description": "**Build:**  '${BUILD_NUMBER}'\\n**CI Results:**  '${CI_URL}'\\n**ShellCheck Results:**  '${SHELLCHECK_URL}'\\n**Status:**  failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\
                 "username": "Jenkins"}' ${BUILDS_DISCORD} '''
        }
      }
    }
    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()
    }
  }
@@ -46,28 +46,27 @@ Find us at:

 ## Supported Architectures

-Our images support multiple architectures such as `x86-64`, `arm64` and `armhf`. We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).

-Simply pulling `lscr.io/linuxserver/radarr` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.
+Simply pulling `lscr.io/linuxserver/radarr:develop` should retrieve the correct image for your arch, but you can also pull specific arch images via tags.

 The architectures supported by this image are:

-| Architecture | Tag |
-| :----: | --- |
-| x86-64 | amd64-latest |
-| arm64 | arm64v8-latest |
-| armhf | arm32v7-latest |
+| Architecture | Available | Tag |
+| :----: | :----: | ---- |
+| x86-64 | ✅ | amd64-\<version tag\> |
+| arm64 | ✅ | arm64v8-\<version tag\> |
+| armhf | ❌ | |

 ## Version Tags

-This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
-
-| Tag | Description |
-| :----: | --- |
-| latest | Stable Radarr releases |
-| develop | Radarr releases from their develop branch |
-| nightly | Radarr releases from their nightly branch |
+This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development tags.

+| Tag | Available | Description |
+| :----: | :----: |--- |
+| latest | ✅ | Stable Radarr releases |
+| develop | ✅ | Radarr releases from their develop branch |
+| nightly | ✅ | Radarr releases from their nightly branch |
 ## Application Setup

 Access the webui at `<your-ip>:7878`, for more information check out [Radarr](https://github.com/Radarr/Radarr).
@@ -93,12 +92,12 @@ Here are some example snippets to help you get started creating a container.
 version: "2.1"
 services:
  radarr:
-    image: lscr.io/linuxserver/radarr
+    image: lscr.io/linuxserver/radarr:develop
    container_name: radarr
    environment:
      - PUID=1000
      - PGID=1000
-      - TZ=Europe/London
+      - TZ=Etc/UTC
    volumes:
      - /path/to/data:/config
      - /path/to/movies:/movies #optional
@@ -115,13 +114,14 @@ docker run -d \
  --name=radarr \
  -e PUID=1000 \
  -e PGID=1000 \
-  -e TZ=Europe/London \
+  -e TZ=Etc/UTC \
  -p 7878:7878 \
  -v /path/to/data:/config \
  -v /path/to/movies:/movies `#optional` \
  -v /path/to/downloadclient-downloads:/downloads `#optional` \
  --restart unless-stopped \
-  lscr.io/linuxserver/radarr
+  lscr.io/linuxserver/radarr:develop
+
 ```

 ## Parameters
@@ -133,7 +133,7 @@ Container images are configured using parameters passed at runtime (such as thos
 | `-p 7878` | The port for the Radarr webinterface |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
-| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London, this is required for Radarr |
+| `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
 | `-v /config` | Database and Radarr configs |
 | `-v /movies` | Location of Movie library on disk (See note in Application setup) |
 | `-v /downloads` | Location of download managers output directory (See note in Application setup) |
@@ -181,7 +181,7 @@ We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to
 * container version number
  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' radarr`
 * image version number
-  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/radarr`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' lscr.io/linuxserver/radarr:develop`

 ## Updating Info

@@ -199,7 +199,7 @@ Below are the instructions for updating containers:

 ### Via Docker Run

-* Update the image: `docker pull lscr.io/linuxserver/radarr`
+* Update the image: `docker pull lscr.io/linuxserver/radarr:develop`
 * Stop the running container: `docker stop radarr`
 * Delete the container: `docker rm radarr`
 * Recreate a new container with the same docker run parameters as instructed above (if mapped correctly to a host folder, your `/config` folder and settings will be preserved)
@@ -234,7 +234,7 @@ cd docker-radarr
 docker build \
  --no-cache \
  --pull \
-  -t lscr.io/linuxserver/radarr:latest .
+  -t lscr.io/linuxserver/radarr:develop .
 ```

 The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
@@ -247,6 +247,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **06.06.23:** - Rebase develop to Alpine 3.18.
+* **19.12.22:** - Rebase develop branch to Alpine 3.17, migrate to s6v3.
 * **20.02.22:** - Rebase develop branch to Alpine.
 * **17.10.21:** - Remove `UMASK_SET`.
 * **11.07.21:** - Make the paths clearer to the user
@@ -6,6 +6,7 @@ custom_version_command: curl -sL https://radarr.servarr.com/v1/update/develop/ch
 release_type: prerelease
 release_tag: develop
 ls_branch: develop
+build_armhf: false
 repo_vars:
  - BUILD_VERSION_ARG = 'RADARR_RELEASE'
  - LS_USER = 'linuxserver'
@@ -23,6 +24,6 @@ repo_vars:
  - CI_DELAY='120'
  - CI_DOCKERENV='TZ=US/Pacific'
  - CI_AUTH='user:password'
-  - CI_WEBPATH=''
+  - CI_WEBPATH='/system/status'
 sponsor_links:
  - { name: "Radarr", url: "https://opencollective.com/radarr" }
@@ -1,43 +1,270 @@
-alpine-baselayout-3.2.0-r18
-alpine-keys-2.4-r1
-apk-tools-2.12.7-r3
-bash-5.1.8-r0
-brotli-libs-1.0.9-r5
-busybox-1.34.1-r4
-ca-certificates-20211220-r0
-ca-certificates-bundle-20211220-r0
-coreutils-9.0-r2
-curl-7.80.0-r0
-icu-libs-69.1-r1
-jq-1.6-r1
-libacl-2.2.53-r0
-libattr-2.5.1-r1
-libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1l-r8
-libcurl-7.80.0-r0
-libgcc-10.3.1_git20211027-r0
-libintl-0.21-r0
-libproc-3.3.17-r0
-libretls-3.3.4-r2
-libssl1.1-1.1.1l-r8
-libstdc++-10.3.1_git20211027-r0
-linux-pam-1.5.2-r0
-musl-1.2.2-r7
-musl-utils-1.2.2-r7
-ncurses-libs-6.3_p20211120-r0
-ncurses-terminfo-base-6.3_p20211120-r0
-nghttp2-libs-1.46.0-r0
-oniguruma-6.9.7.1-r0
-procps-3.3.17-r0
-readline-8.1.1-r0
-s6-ipcserver-2.11.0.0-r0
-scanelf-1.3.3-r0
-shadow-4.8.1-r1
-skalibs-2.11.0.0-r0
-sqlite-libs-3.36.0-r0
-ssl_client-1.34.1-r4
-tzdata-2021e-r0
-utmps-0.1.0.3-r0
-xz-5.2.5-r0
-xz-libs-5.2.5-r0
-zlib-1.2.11-r3
+NAME                                                                           VERSION                 TYPE   
+Dapper                                                                         2.0.123                 dotnet  
+DryIoc.Microsoft.DependencyInjection                                           6.1.1                   dotnet  
+DryIoc.dll                                                                     5.3.4                   dotnet  
+Dynamitey                                                                      2.0.9.136               dotnet  
+Equ                                                                            2.3.0                   dotnet  
+FluentValidation                                                               9.5.4                   dotnet  
+Ical.Net                                                                       4.2.0                   dotnet  
+ImpromptuInterface                                                             7.0.1                   dotnet  
+Instances                                                                      1.6.1                   dotnet  
+MailKit                                                                        3.6.0                   dotnet  
+Microsoft.CSharp                                                               4.5.0                   dotnet  
+Microsoft.Data.SqlClient                                                       2.1.2                   dotnet  
+Microsoft.Data.SqlClient.SNI.runtime                                           2.1.1                   dotnet  
+Microsoft.Extensions.Configuration                                             6.0.0                   dotnet  
+Microsoft.Extensions.Configuration                                             6.0.1                   dotnet  
+Microsoft.Extensions.Configuration.Abstractions                                6.0.0                   dotnet  
+Microsoft.Extensions.Configuration.Binder                                      6.0.0                   dotnet  
+Microsoft.Extensions.Configuration.CommandLine                                 6.0.0                   dotnet  
+Microsoft.Extensions.Configuration.EnvironmentVariables                        6.0.1                   dotnet  
+Microsoft.Extensions.Configuration.FileExtensions                              6.0.0                   dotnet  
+Microsoft.Extensions.Configuration.Json                                        6.0.0                   dotnet  
+Microsoft.Extensions.Configuration.UserSecrets                                 6.0.1                   dotnet  
+Microsoft.Extensions.DependencyInjection                                       6.0.1                   dotnet  
+Microsoft.Extensions.DependencyInjection.Abstractions                          6.0.0                   dotnet  
+Microsoft.Extensions.FileProviders.Abstractions                                6.0.0                   dotnet  
+Microsoft.Extensions.FileProviders.Physical                                    6.0.0                   dotnet  
+Microsoft.Extensions.FileSystemGlobbing                                        6.0.0                   dotnet  
+Microsoft.Extensions.Hosting                                                   6.0.1                   dotnet  
+Microsoft.Extensions.Hosting.Abstractions                                      6.0.0                   dotnet  
+Microsoft.Extensions.Hosting.WindowsServices                                   6.0.1                   dotnet  
+Microsoft.Extensions.Logging                                                   6.0.0                   dotnet  
+Microsoft.Extensions.Logging.Abstractions                                      6.0.0                   dotnet  
+Microsoft.Extensions.Logging.Configuration                                     6.0.0                   dotnet  
+Microsoft.Extensions.Logging.Console                                           6.0.0                   dotnet  
+Microsoft.Extensions.Logging.Debug                                             6.0.0                   dotnet  
+Microsoft.Extensions.Logging.EventLog                                          6.0.0                   dotnet  
+Microsoft.Extensions.Logging.EventSource                                       6.0.0                   dotnet  
+Microsoft.Extensions.Options                                                   6.0.0                   dotnet  
+Microsoft.Extensions.Options.ConfigurationExtensions                           6.0.0                   dotnet  
+Microsoft.Extensions.Primitives                                                6.0.0                   dotnet  
+Microsoft.Identity.Client                                                      4.21.1                  dotnet  
+Microsoft.IdentityModel.JsonWebTokens                                          6.8.0                   dotnet  
+Microsoft.IdentityModel.Logging                                                6.8.0                   dotnet  
+Microsoft.IdentityModel.Protocols                                              6.8.0                   dotnet  
+Microsoft.IdentityModel.Protocols.OpenIdConnect                                6.8.0                   dotnet  
+Microsoft.IdentityModel.Tokens                                                 6.8.0                   dotnet  
+Microsoft.NETCore.Platforms                                                    1.1.0                   dotnet  
+Microsoft.NETCore.Targets                                                      1.1.0                   dotnet  
+Microsoft.OpenApi                                                              1.2.3                   dotnet  
+Microsoft.Win32.Primitives                                                     4.3.0                   dotnet  
+Microsoft.Win32.Registry                                                       4.7.0                   dotnet  
+Microsoft.Win32.SystemEvents                                                   6.0.0                   dotnet  
+MimeKit                                                                        3.6.0                   dotnet  
+Mono.Nat                                                                       3.0.1                   dotnet  
+Mono.Posix.NETStandard                                                         5.20.1.34-servarr20     dotnet  
+MonoTorrent                                                                    2.0.7                   dotnet  
+NETStandard.Library                                                            1.6.1                   dotnet  
+NLog                                                                           5.2.0                   dotnet  
+NLog.Extensions.Logging                                                        5.3.0                   dotnet  
+NLog.Targets.Syslog                                                            7.0.0                   dotnet  
+Newtonsoft.Json                                                                13.0.2                  dotnet  
+NodaTime                                                                       3.0.0                   dotnet  
+Npgsql                                                                         5.0.11                  dotnet  
+Npgsql                                                                         6.0.3                   dotnet  
+Polly.Contrib.WaitAndRetry                                                     1.1.1                   dotnet  
+Portable.BouncyCastle                                                          1.9.0                   dotnet  
+ReusableTasks                                                                  2.0.0                   dotnet  
+Sentry                                                                         3.23.1                  dotnet  
+Servarr.FFMpegCore                                                             4.7.0-26                dotnet  
+Servarr.FFprobe                                                                5.1.2.106               dotnet  
+Servarr.FluentMigrator                                                         3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Abstractions                                            3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Extensions.Oracle                                       3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Extensions.Postgres                                     3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Extensions.SqlAnywhere                                  3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Extensions.SqlServer                                    3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Runner                                                  3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Runner.Core                                             3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Runner.Db2                                              3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Runner.Firebird                                         3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Runner.Hana                                             3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Runner.MySql                                            3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Runner.Oracle                                           3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Runner.Postgres                                         3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Runner.Redshift                                         3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Runner.SQLite                                           3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Runner.SqlAnywhere                                      3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Runner.SqlServer                                        3.3.2.9                 dotnet  
+Servarr.FluentMigrator.Runner.SqlServerCe                                      3.3.2.9                 dotnet  
+SharpZipLib                                                                    1.3.3                   dotnet  
+SixLabors.ImageSharp                                                           3.0.1                   dotnet  
+Swashbuckle.AspNetCore.Swagger                                                 6.5.0                   dotnet  
+Swashbuckle.AspNetCore.SwaggerGen                                              6.5.0                   dotnet  
+System.AppContext                                                              4.3.0                   dotnet  
+System.Buffers                                                                 4.3.0                   dotnet  
+System.Collections                                                             4.3.0                   dotnet  
+System.Collections.Concurrent                                                  4.3.0                   dotnet  
+System.ComponentModel                                                          4.3.0                   dotnet  
+System.ComponentModel.Annotations                                              4.4.1                   dotnet  
+System.Configuration.ConfigurationManager                                      6.0.1                   dotnet  
+System.Console                                                                 4.3.0                   dotnet  
+System.Data.SQLite.Core.Servarr                                                1.0.115.5-18            dotnet  
+System.Diagnostics.Debug                                                       4.3.0                   dotnet  
+System.Diagnostics.DiagnosticSource                                            6.0.0                   dotnet  
+System.Diagnostics.EventLog                                                    6.0.0                   dotnet  
+System.Diagnostics.Tools                                                       4.3.0                   dotnet  
+System.Diagnostics.Tracing                                                     4.3.0                   dotnet  
+System.Drawing.Common                                                          6.0.0                   dotnet  
+System.Formats.Asn1                                                            6.0.0                   dotnet  
+System.Globalization                                                           4.3.0                   dotnet  
+System.Globalization.Calendars                                                 4.3.0                   dotnet  
+System.Globalization.Extensions                                                4.3.0                   dotnet  
+System.IO                                                                      4.3.0                   dotnet  
+System.IO.Compression                                                          4.3.0                   dotnet  
+System.IO.Compression.ZipFile                                                  4.3.0                   dotnet  
+System.IO.FileSystem                                                           4.3.0                   dotnet  
+System.IO.FileSystem.AccessControl                                             5.0.0                   dotnet  
+System.IO.FileSystem.Primitives                                                4.3.0                   dotnet  
+System.IdentityModel.Tokens.Jwt                                                6.8.0                   dotnet  
+System.Linq                                                                    4.3.0                   dotnet  
+System.Linq.Expressions                                                        4.3.0                   dotnet  
+System.Memory                                                                  4.5.5                   dotnet  
+System.Net.Http                                                                4.3.0                   dotnet  
+System.Net.NameResolution                                                      4.3.0                   dotnet  
+System.Net.Primitives                                                          4.3.0                   dotnet  
+System.Net.Sockets                                                             4.3.0                   dotnet  
+System.ObjectModel                                                             4.3.0                   dotnet  
+System.Private.Uri                                                             4.3.0                   dotnet  
+System.Reflection                                                              4.3.0                   dotnet  
+System.Reflection.Emit                                                         4.3.0                   dotnet  
+System.Reflection.Emit.ILGeneration                                            4.3.0                   dotnet  
+System.Reflection.Emit.Lightweight                                             4.3.0                   dotnet  
+System.Reflection.Extensions                                                   4.3.0                   dotnet  
+System.Reflection.Primitives                                                   4.3.0                   dotnet  
+System.Reflection.TypeExtensions                                               4.3.0                   dotnet  
+System.Resources.ResourceManager                                               4.3.0                   dotnet  
+System.Runtime                                                                 4.3.0                   dotnet  
+System.Runtime.Caching                                                         4.7.0                   dotnet  
+System.Runtime.CompilerServices.Unsafe                                         6.0.0                   dotnet  
+System.Runtime.Extensions                                                      4.3.0                   dotnet  
+System.Runtime.Handles                                                         4.3.0                   dotnet  
+System.Runtime.InteropServices                                                 4.3.0                   dotnet  
+System.Runtime.InteropServices.RuntimeInformation                              4.3.0                   dotnet  
+System.Runtime.Loader                                                          4.3.0                   dotnet  
+System.Runtime.Numerics                                                        4.3.0                   dotnet  
+System.Security.AccessControl                                                  6.0.0                   dotnet  
+System.Security.Cryptography.Algorithms                                        4.3.0                   dotnet  
+System.Security.Cryptography.Cng                                               4.5.0                   dotnet  
+System.Security.Cryptography.Csp                                               4.3.0                   dotnet  
+System.Security.Cryptography.Encoding                                          4.3.0                   dotnet  
+System.Security.Cryptography.OpenSsl                                           4.3.0                   dotnet  
+System.Security.Cryptography.Pkcs                                              6.0.0                   dotnet  
+System.Security.Cryptography.Primitives                                        4.3.0                   dotnet  
+System.Security.Cryptography.ProtectedData                                     6.0.0                   dotnet  
+System.Security.Cryptography.X509Certificates                                  4.3.0                   dotnet  
+System.Security.Permissions                                                    6.0.0                   dotnet  
+System.Security.Principal.Windows                                              5.0.0                   dotnet  
+System.ServiceProcess.ServiceController                                        6.0.0                   dotnet  
+System.Text.Encoding                                                           4.3.0                   dotnet  
+System.Text.Encoding.CodePages                                                 6.0.0                   dotnet  
+System.Text.Encoding.Extensions                                                4.3.0                   dotnet  
+System.Text.Encodings.Web                                                      6.0.0                   dotnet  
+System.Text.Json                                                               6.0.7                   dotnet  
+System.Text.RegularExpressions                                                 4.3.0                   dotnet  
+System.Threading                                                               4.3.0                   dotnet  
+System.Threading.Tasks                                                         4.3.0                   dotnet  
+System.Threading.Tasks.Extensions                                              4.3.0                   dotnet  
+System.Threading.ThreadPool                                                    4.3.0                   dotnet  
+System.Threading.Timer                                                         4.3.0                   dotnet  
+System.ValueTuple                                                              4.5.0                   dotnet  
+System.Windows.Extensions                                                      6.0.0                   dotnet  
+System.Xml.ReaderWriter                                                        4.3.0                   dotnet  
+System.Xml.XDocument                                                           4.3.0                   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.2-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                  binary  
+busybox                                                                        1.36.1-r0               apk     
+busybox-binsh                                                                  1.36.1-r0               apk     
+ca-certificates                                                                20230506-r0             apk     
+ca-certificates-bundle                                                         20230506-r0             apk     
+coreutils                                                                      9.3-r1                  apk     
+curl                                                                           8.1.2-r0                apk     
+icu-data-en                                                                    73.2-r0                 apk     
+icu-libs                                                                       73.2-r0                 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.1-r1                apk     
+libcurl                                                                        8.1.2-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.3-r1                apk     
+libssl3                                                                        3.1.1-r1                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     
+musl                                                                           1.2.4-r0                apk     
+musl-utils                                                                     1.2.4-r0                apk     
+ncurses-terminfo-base                                                          6.4_p20230506-r0        apk     
+netcat-openbsd                                                                 1.219-r1                apk     
+nghttp2-libs                                                                   1.53.0-r0               apk     
+oniguruma                                                                      6.9.8-r1                apk     
+procps-ng                                                                      4.0.3-r1                apk     
+readline                                                                       8.2.1-r1                apk     
+runtime.any.System.Collections                                                 4.3.0                   dotnet  
+runtime.any.System.Diagnostics.Tools                                           4.3.0                   dotnet  
+runtime.any.System.Diagnostics.Tracing                                         4.3.0                   dotnet  
+runtime.any.System.Globalization                                               4.3.0                   dotnet  
+runtime.any.System.Globalization.Calendars                                     4.3.0                   dotnet  
+runtime.any.System.IO                                                          4.3.0                   dotnet  
+runtime.any.System.Reflection                                                  4.3.0                   dotnet  
+runtime.any.System.Reflection.Extensions                                       4.3.0                   dotnet  
+runtime.any.System.Reflection.Primitives                                       4.3.0                   dotnet  
+runtime.any.System.Resources.ResourceManager                                   4.3.0                   dotnet  
+runtime.any.System.Runtime                                                     4.3.0                   dotnet  
+runtime.any.System.Runtime.Handles                                             4.3.0                   dotnet  
+runtime.any.System.Runtime.InteropServices                                     4.3.0                   dotnet  
+runtime.any.System.Text.Encoding                                               4.3.0                   dotnet  
+runtime.any.System.Text.Encoding.Extensions                                    4.3.0                   dotnet  
+runtime.any.System.Threading.Tasks                                             4.3.0                   dotnet  
+runtime.any.System.Threading.Timer                                             4.3.0                   dotnet  
+runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl       4.3.0                   dotnet  
+runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl      4.3.0                   dotnet  
+runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl      4.3.0                   dotnet  
+runtime.native.System                                                          4.3.0                   dotnet  
+runtime.native.System.IO.Compression                                           4.3.0                   dotnet  
+runtime.native.System.Net.Http                                                 4.3.0                   dotnet  
+runtime.native.System.Security.Cryptography.Apple                              4.3.0                   dotnet  
+runtime.native.System.Security.Cryptography.OpenSsl                            4.3.0                   dotnet  
+runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl  4.3.0                   dotnet  
+runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl  4.3.0                   dotnet  
+runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple        4.3.0                   dotnet  
+runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl      4.3.0                   dotnet  
+runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl         4.3.0                   dotnet  
+runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl   4.3.0                   dotnet  
+runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl   4.3.0                   dotnet  
+runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl   4.3.0                   dotnet  
+runtime.unix.Microsoft.Win32.Primitives                                        4.3.0                   dotnet  
+runtime.unix.System.Console                                                    4.3.0                   dotnet  
+runtime.unix.System.Diagnostics.Debug                                          4.3.0                   dotnet  
+runtime.unix.System.IO.FileSystem                                              4.3.0                   dotnet  
+runtime.unix.System.Net.Primitives                                             4.3.0                   dotnet  
+runtime.unix.System.Net.Sockets                                                4.3.0                   dotnet  
+runtime.unix.System.Private.Uri                                                4.3.0                   dotnet  
+runtime.unix.System.Runtime.Extensions                                         4.3.0                   dotnet  
+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-r0               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     
@@ -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,8 @@ app_setup_block: |

  # changelog
 changelogs:
+  - { date: "06.06.23:", desc: "Rebase develop to Alpine 3.18." }
+  - { date: "19.12.22:", desc: "Rebase develop branch to Alpine 3.17, migrate to s6v3." }
  - { date: "20.02.22:", desc: "Rebase develop branch to Alpine." }
  - { date: "17.10.21:", desc: "Remove `UMASK_SET`." }
  - { date: "11.07.21:", desc: "Make the paths clearer to the user" }
@@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# permissions
-chown -R abc:abc \
-    /config
@@ -0,0 +1,6 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+# permissions
+lsiown -R abc:abc \
+    /config
@@ -0,0 +1 @@
+oneshot
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-radarr-config/run
@@ -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
@@ -0,0 +1 @@
+3
@@ -0,0 +1,7 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 \
+        cd /app/radarr/bin s6-setuidgid abc /app/radarr/bin/Radarr \
+        -nobrowser -data=/config
@@ -0,0 +1 @@
+longrun
@@ -1,7 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-cd /app/radarr/bin || exit
-
-exec \
-    s6-setuidgid abc /app/radarr/bin/Radarr \
-    -nobrowser -data=/config
Author	SHA1	Message	Date
LinuxServer-CI	d77e9a9292	Bot Updating Package Versions	2023-06-18 16:56:22 +00:00
LinuxServer-CI	59f928450e	Bot Updating Package Versions	2023-06-14 08:05:00 +00:00
AdamandGitHub	1faa75b850	Merge pull request #208 from linuxserver/develop-3.18	2023-06-14 09:01:33 +01:00
TheSpad	052ff40b8f	Rebase to 3.18 (develop)	2023-06-06 15:22:08 +01:00
LinuxServer-CI	bd69289e16	Bot Updating Package Versions	2023-06-04 16:46:43 +00:00
LinuxServer-CI	7726e689d2	Bot Updating Package Versions	2023-05-28 15:40:08 +00:00
LinuxServer-CI	b03f40cfab	Bot Updating Templated Files	2023-05-28 15:36:39 +00:00
LinuxServer-CI	71a7497f5c	Bot Updating Package Versions	2023-05-21 16:55:47 +00:00
LinuxServer-CI	056d32010d	Bot Updating Package Versions	2023-05-15 23:55:29 +00:00
LinuxServer-CI	75938df94d	Bot Updating Package Versions	2023-05-07 16:56:04 +00:00
LinuxServer-CI	38470c7a83	Bot Updating Templated Files	2023-04-30 16:56:15 +00:00
LinuxServer-CI	6102ef6c50	Bot Updating Templated Files	2023-04-30 16:55:10 +00:00
LinuxServer-CI	19b814c5a3	Bot Updating Package Versions	2023-04-23 13:40:49 -05:00
LinuxServer-CI	cf8059bced	Bot Updating Package Versions	2023-04-23 16:55:22 +00:00
LinuxServer-CI	e13aaff00b	Bot Updating Package Versions	2023-04-15 11:00:26 -05:00
LinuxServer-CI	324b9c65f8	Bot Updating Package Versions	2023-04-09 18:56:21 +02:00
LinuxServer-CI	2f16e851a1	Bot Updating Package Versions	2023-04-03 18:03:43 +02:00
LinuxServer-CI	089ea9666e	Bot Updating Templated Files	2023-04-03 18:00:40 +02:00
LinuxServer-CI	ed5f04a269	Bot Updating Templated Files	2023-04-03 17:59:04 +02:00
LinuxServer-CI	8afd10a56d	Bot Updating Templated Files	2023-04-03 17:57:27 +02:00
LinuxServer-CI	1ea2f4aa3a	Bot Updating Package Versions	2023-03-27 10:58:05 -05:00
LinuxServer-CI	0e541c9b91	Bot Updating Package Versions	2023-03-06 17:00:35 +01:00
LinuxServer-CI	a098ca06aa	Bot Updating Templated Files	2023-03-06 16:57:24 +01:00
LinuxServer-CI	edec3d0283	Bot Updating Package Versions	2023-02-24 12:10:51 +00:00
AdamandGitHub	3bc534776e	Merge pull request #199 from linuxserver/develop-ping	2023-02-24 12:07:50 +00:00
TheSpad	bcd75ef38b	Use /ping endpoint for readiness check	2023-02-24 10:04:53 +00:00
LinuxServer-CI	76e74a47ea	Bot Updating Package Versions	2023-02-20 16:58:30 +01:00
LinuxServer-CI	c8472aa5f3	Bot Updating Templated Files	2023-02-11 13:22:04 -06:00
LinuxServer-CI	dc34da5882	Bot Updating Templated Files	2023-02-11 13:20:41 -06:00
LinuxServer-CI	03c4e6e1e0	Bot Updating Package Versions	2023-01-21 11:46:26 -06:00
LinuxServer-CI	68c28f77ec	Bot Updating Package Versions	2023-01-16 16:57:46 +01:00
LinuxServer-CI	79772e74e3	Bot Updating Package Versions	2023-01-02 09:57:45 -06:00
LinuxServer-CI	9e0745e025	Bot Updating Package Versions	2022-12-21 12:09:25 -06:00
RoxedusandGitHub	c587935fc6	Merge pull request #192 from linuxserver/develop-3.17	2022-12-21 19:06:53 +01:00
TheSpad	3e5df71d6b	Rebase develop tp 3.17, migrate to s6v3	2022-12-19 17:34:49 +00:00
LinuxServer-CI	a3b9f6daf4	Bot Updating Templated Files	2022-12-05 17:00:02 +01:00
LinuxServer-CI	75dc98406b	Bot Updating Templated Files	2022-12-05 09:58:45 -06:00
LinuxServer-CI	11e779fa65	Bot Updating Templated Files	2022-12-05 16:57:23 +01:00
LinuxServer-CI	263a29f5ba	Bot Updating Package Versions	2022-11-14 10:00:29 -06:00
LinuxServer-CI	7223cc6b51	Bot Updating Templated Files	2022-11-14 09:57:29 -06:00
LinuxServer-CI	ff72ad430d	Bot Updating Package Versions	2022-11-07 09:57:59 -06:00
LinuxServer-CI	e1f577754c	Bot Updating Package Versions	2022-10-31 10:58:54 -05:00
LinuxServer-CI	7a7b2b382e	Bot Updating Templated Files	2022-09-19 11:00:39 -05:00
LinuxServer-CI	c606a84d52	Bot Updating Package Versions	2022-09-05 17:57:43 +02:00
LinuxServer-CI	7e976ef19c	Bot Updating Package Versions	2022-08-29 17:57:53 +02:00
LinuxServer-CI	e847e7af62	Bot Updating Package Versions	2022-08-14 00:00:18 +02:00
LinuxServer-CI	fdac0c3cd9	Bot Updating Package Versions	2022-08-08 10:57:55 -05:00
LinuxServer-CI	2bd9d1cb8e	Bot Updating Package Versions	2022-08-01 17:59:23 +02:00
LinuxServer-CI	cc04ddb5c2	Bot Updating Package Versions	2022-07-20 07:00:39 -05:00
LinuxServer-CI	ca55ea1b88	Bot Updating Package Versions	2022-07-11 18:02:32 +02:00
LinuxServer-CI	9cf32c471b	Bot Updating Package Versions	2022-07-04 10:57:49 -05:00
LinuxServer-CI	4d3ba661a4	Bot Updating Package Versions	2022-05-16 10:58:24 -05:00
LinuxServer-CI	0134bd5147	Bot Updating Package Versions	2022-05-02 18:03:23 +02:00
LinuxServer-CI	478cedab2b	Bot Updating Templated Files	2022-05-02 11:00:56 -05:00
LinuxServer-CI	3dbf3c6365	Bot Updating Templated Files	2022-05-02 10:59:33 -05:00
LinuxServer-CI	818554338b	Bot Updating Package Versions	2022-04-15 04:50:25 +02:00
LinuxServer-CI	fe7c57a21c	Bot Updating Package Versions	2022-04-04 17:57:48 +02:00
LinuxServer-CI	032919d838	Bot Updating Package Versions	2022-03-31 10:00:29 -05:00
LinuxServer-CI	b19b39a991	Bot Updating Package Versions	2022-03-28 17:57:58 +02:00
LinuxServer-CI	c72a1d9492	Bot Updating Package Versions	2022-03-21 08:02:00 -05:00
aptalcaandGitHub	4123bb8ea2	Merge pull request #172 from linuxserver/remove-develop-warning Remove alpine rebase warning	2022-03-21 08:58:57 -04:00
TheSpad	4846b6f0a9	Remove alpine warning	2022-03-20 17:50:01 +00:00
LinuxServer-CI	84d840b8d1	Bot Updating Package Versions	2022-02-27 19:59:44 +01:00
				`@@ -0,0 +1 @@`
				`/etc/s6-overlay/s6-rc.d/init-radarr-config/run`