Bot Updating Package Versions

2021-05-04 14:43:36 +01:00 · 2021-04-27 16:00:33 +01:00 · 2021-04-22 22:09:01 -04:00 · 2021-04-17 22:58:34 +01:00 · 2021-04-17 21:57:07 +00:00 · 2021-04-13 10:06:24 +00:00
38 changed files with 587 additions and 982 deletions
@@ -1,20 +0,0 @@
-# This file is globally distributed to all container image projects from
-# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig
-
-# top-most EditorConfig file
-root = true
-
-# Unix-style newlines with a newline ending every file
-[*]
-end_of_line = lf
-insert_final_newline = true
-# trim_trailing_whitespace may cause unintended issues and should not be globally set true
-trim_trailing_whitespace = false
-
-[{Dockerfile*,**.yml}]
-indent_style = space
-indent_size = 2
-
-[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
-indent_style = space
-indent_size = 4
@@ -4,7 +4,7 @@

 * While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open.
 * Read, and fill the Pull Request template
-  * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
+  * If this is a fix for a typo in code or documentation in the README please file an issue
  * If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
 * If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)

@@ -24,7 +24,7 @@
 ## Readme

 If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
-Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-radarr/edit/develop/readme-vars.yml).
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-radarr/edit/nightly/readme-vars.yml).

 These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
 Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-radarr)
@@ -115,7 +115,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Update the changelog

-If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-radarr/tree/develop/root), add an entry to the changelog
+If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-radarr/tree/nightly/root), add an entry to the changelog

 ```yml
 changelogs:
@@ -0,0 +1,40 @@
+---
+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" -->
@@ -1,77 +0,0 @@
-# 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
-        - armhf
-    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
@@ -0,0 +1,25 @@
+---
+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 -->
@@ -1,31 +0,0 @@
-# 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
@@ -6,7 +6,7 @@

 <!--- Before submitting a pull request please check the following -->

-<!---  If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR  -->
+<!---  If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR  -->
 <!---  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/ -->
 <!---  That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message   -->
 <!---  You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
@@ -21,7 +21,7 @@

 ------------------------------

- - [ ] I have read the [contributing](https://github.com/linuxserver/docker-radarr/blob/develop/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
+ - [ ] I have read the [contributing](https://github.com/linuxserver/docker-radarr/blob/nightly/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications

 ------------------------------

@@ -1,16 +0,0 @@
-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
@@ -1,13 +0,0 @@
-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
@@ -4,26 +4,24 @@ on:
  workflow_dispatch:

 jobs:
-  external-trigger-develop:
+  external-trigger-nightly:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v2.3.3

      - name: External Trigger
-        if: github.ref == 'refs/heads/develop'
+        if: github.ref == 'refs/heads/nightly'
        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
+          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_RADARR_NIGHTLY }}" ]; then
+            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_RADARR_NIGHTLY is set; skipping trigger. ****"
            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 "**** External trigger running off of nightly branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_RADARR_NIGHTLY\". ****"
          echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sL https://radarr.servarr.com/v1/update/develop/changes?runtime=netcore%26os=linuxmusl | jq -r '.[0].version')
+          EXT_RELEASE=$(curl -sL https://radarr.servarr.com/v1/update/nightly/changes?os=linux | jq -r '.[0].version')
          if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
            echo "**** Can't retrieve external version, exiting ****"
-            FAILURE_REASON="Can't retrieve external version for radarr branch develop"
+            FAILURE_REASON="Can't retrieve external version for radarr branch nightly"
            GHA_TRIGGER_URL="https://github.com/linuxserver/docker-radarr/actions/runs/${{ github.run_id }}"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
@@ -32,10 +30,9 @@ 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"
+          tag="nightly"
          token=$(curl -sX GET \
            "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fradarr%3Apull" \
            | jq -r '.token')
@@ -51,37 +48,29 @@ jobs:
              | jq -r '.config.digest')
          image_info=$(curl -sL \
            --header "Authorization: Bearer ${token}" \
-            "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
+            "https://ghcr.io/v2/${image}/blobs/${digest}" \
+            | jq -r '.container_config')
          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
            echo "**** Can't retrieve last pushed version, exiting ****"
-            FAILURE_REASON="Can't retrieve last pushed version for radarr tag develop"
+            FAILURE_REASON="Can't retrieve last pushed version for radarr tag nightly"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
            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
+          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-radarr/job/nightly/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 \
+              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-radarr/job/nightly/buildWithParameters?PACKAGE_CHECK=false \
              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
            echo "**** Jenkins job queue url: ${response%$'\r'} ****"
            echo "**** Sleeping 10 seconds until job starts ****"
@@ -89,7 +78,6 @@ 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" \
@@ -97,7 +85,7 @@ jobs:
              --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
              --data-urlencode "Submit=Submit"
            echo "**** Notifying Discord ****"
-            TRIGGER_REASON="A version change was detected for radarr tag develop. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
+            TRIGGER_REASON="A version change was detected for radarr tag nightly. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
@@ -2,14 +2,14 @@ name: External Trigger Scheduler

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

 jobs:
  external-trigger-scheduler:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v2.3.3
        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_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. ****"
+            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. ****"
              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,10 +36,8 @@ 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} 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
+              echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
            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 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)!'
+        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-radarr/blob/nightly/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-radarr/blob/nightly/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
+        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-radarr/blob/nightly/.github/PULL_REQUEST_TEMPLATE.md)!'
        repo-token: ${{ secrets.GITHUB_TOKEN }}
@@ -4,28 +4,25 @@ on:
  workflow_dispatch:

 jobs:
-  package-trigger-develop:
+  package-trigger-nightly:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v3.1.0
+      - uses: actions/checkout@v2.3.3

      - name: Package Trigger
-        if: github.ref == 'refs/heads/develop'
+        if: github.ref == 'refs/heads/nightly'
        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
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_RADARR_NIGHTLY }}" ]; then
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_RADARR_NIGHTLY is set; skipping trigger. ****"
            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
+          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-radarr/job/nightly/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
+          echo "**** Package trigger running off of nightly branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_RADARR_NIGHTLY\". ****"
          response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-radarr/job/develop/buildWithParameters?PACKAGE_CHECK=true \
+            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-radarr/job/nightly/buildWithParameters?PACKAGE_CHECK=true \
            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
          echo "**** Jenkins job queue url: ${response%$'\r'} ****"
          echo "**** Sleeping 10 seconds until job starts ****"
@@ -33,7 +30,6 @@ 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:  '49 16 * * 0'
+    - cron:  '53 15 * * 1'
  workflow_dispatch:

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

@@ -17,16 +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 | yq -r '.ls_branch')
+            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. ****"
              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 }}" \
@@ -36,11 +38,9 @@ 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} ****"
@@ -1,10 +0,0 @@
-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
@@ -0,0 +1,23 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v1
+      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,45 +1,48 @@
-# syntax=docker/dockerfile:1
-
-FROM ghcr.io/linuxserver/baseimage-alpine:3.17
+FROM ghcr.io/linuxserver/baseimage-ubuntu:focal

 # 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"
+LABEL maintainer="thelamer"

 # environment settings
-ARG RADARR_BRANCH="develop"
+ARG DEBIAN_FRONTEND="noninteractive"
+ARG RADARR_BRANCH="nightly"
 ENV XDG_CONFIG_HOME="/config/xdg"

 RUN \
-  echo "**** install packages ****" && \
-  apk add -U --upgrade --no-cache \
-    icu-libs \
-    sqlite-libs && \
-  echo "**** install radarr ****" && \
-  mkdir -p /app/radarr/bin && \
-  if [ -z ${RADARR_RELEASE+x} ]; then \
-    RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linuxmusl" \
-    | jq -r '.[0].version'); \
-  fi && \
-  curl -o \
-    /tmp/radarr.tar.gz -L \
-    "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linuxmusl&runtime=netcore&arch=x64" && \
-  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/)" > /app/radarr/package_info && \
-  echo "**** cleanup ****" && \
-  rm -rf \
-    /app/radarr/bin/Radarr.Update \
-    /tmp/*
+ echo "**** install packages ****" && \
+ apt-get update && \
+ apt-get install --no-install-recommends -y \
+	jq \
+	libicu66 \
+	libmediainfo0v5 \
+	sqlite3 && \
+ 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?os=linux" \
+	| 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=linux&runtime=netcore&arch=x64" && \
+ tar ixzf \
+ /tmp/radarr.tar.gz -C \
+	/app/radarr/bin --strip-components=1 && \
+ echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \
+ echo "**** cleanup ****" && \
+ rm -rf \
+	/app/radarr/bin/Radarr.Update \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*

 # copy local files
 COPY root/ /

 # ports and volumes
 EXPOSE 7878
-
 VOLUME /config
@@ -1,45 +1,48 @@
-# syntax=docker/dockerfile:1
-
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-focal

 # 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"
+LABEL maintainer="thelamer"

 # environment settings
-ARG RADARR_BRANCH="develop"
+ARG DEBIAN_FRONTEND="noninteractive"
+ARG RADARR_BRANCH="nightly"
 ENV XDG_CONFIG_HOME="/config/xdg"

 RUN \
-  echo "**** install packages ****" && \
-  apk add -U --upgrade --no-cache \
-    icu-libs \
-    sqlite-libs && \
-  echo "**** install radarr ****" && \
-  mkdir -p /app/radarr/bin && \
-  if [ -z ${RADARR_RELEASE+x} ]; then \
-    RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linuxmusl" \
-    | jq -r '.[0].version'); \
-  fi && \
-  curl -o \
-    /tmp/radarr.tar.gz -L \
-    "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linuxmusl&runtime=netcore&arch=arm64" && \
-  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/)" > /app/radarr/package_info && \
-  echo "**** cleanup ****" && \
-  rm -rf \
-    /app/radarr/bin/Radarr.Update \
-    /tmp/*
+ echo "**** install packages ****" && \
+ apt-get update && \
+ apt-get install --no-install-recommends -y \
+	jq \
+	libicu66 \
+	libmediainfo0v5 \
+	sqlite3 && \
+ 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?os=linux" \
+	| 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=linux&runtime=netcore&arch=arm64" && \
+ tar ixzf \
+ /tmp/radarr.tar.gz -C \
+	/app/radarr/bin --strip-components=1 && \
+ echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \
+ echo "**** cleanup ****" && \
+ rm -rf \
+	/app/radarr/bin/Radarr.Update \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*

 # copy local files
 COPY root/ /

 # ports and volumes
 EXPOSE 7878
-
 VOLUME /config
@@ -1,45 +1,48 @@
-# syntax=docker/dockerfile:1
-
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
+FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-focal

 # 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"
+LABEL maintainer="thelamer"

 # environment settings
-ARG RADARR_BRANCH="develop"
+ARG DEBIAN_FRONTEND="noninteractive"
+ARG RADARR_BRANCH="nightly"
 ENV XDG_CONFIG_HOME="/config/xdg"

 RUN \
-  echo "**** install packages ****" && \
-  apk add -U --upgrade --no-cache \
-    icu-libs \
-    sqlite-libs && \
-  echo "**** install radarr ****" && \
-  mkdir -p /app/radarr/bin && \
-  if [ -z ${RADARR_RELEASE+x} ]; then \
-    RADARR_RELEASE=$(curl -sL "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/changes?runtime=netcore&os=linuxmusl" \
-    | jq -r '.[0].version'); \
-  fi && \
-  curl -o \
-    /tmp/radarr.tar.gz -L \
-    "https://radarr.servarr.com/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linuxmusl&runtime=netcore&arch=arm" && \
-  tar xzf \
-    /tmp/radarr.tar.gz -C \
-    /app/radarr/bin --strip-components=1 && \
-  echo -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/*
+ echo "**** install packages ****" && \
+ apt-get update && \
+ apt-get install --no-install-recommends -y \
+	jq \
+	libicu66 \
+	libmediainfo0v5 \
+	sqlite3 && \
+ 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?os=linux" \
+	| 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=linux&runtime=netcore&arch=arm" && \
+ tar ixzf \
+ /tmp/radarr.tar.gz -C \
+	/app/radarr/bin --strip-components=1 && \
+ echo "**** cleanup ****" && \
+ echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \
+ rm -rf \
+	/app/radarr/bin/Radarr.Update \
+	/tmp/* \
+	/var/lib/apt/lists/* \
+	/var/tmp/*

 # copy local files
 COPY root/ /

 # ports and volumes
 EXPOSE 7878
-
 VOLUME /config
@@ -16,7 +16,6 @@ pipeline {
    GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab')
    GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0')
    GITLAB_NAMESPACE=credentials('gitlab-namespace-id')
-    SCARF_TOKEN=credentials('scarf_api_key')
    BUILD_VERSION_ARG = 'RADARR_RELEASE'
    LS_USER = 'linuxserver'
    LS_REPO = 'docker-radarr'
@@ -24,7 +23,7 @@ pipeline {
    DOCKERHUB_IMAGE = 'linuxserver/radarr'
    DEV_DOCKERHUB_IMAGE = 'lsiodev/radarr'
    PR_DOCKERHUB_IMAGE = 'lspipepr/radarr'
-    DIST_IMAGE = 'alpine'
+    DIST_IMAGE = 'ubuntu'
    MULTIARCH='true'
    CI='true'
    CI_WEB='true'
@@ -33,22 +32,16 @@ pipeline {
    CI_DELAY='120'
    CI_DOCKERENV='TZ=US/Pacific'
    CI_AUTH='user:password'
-    CI_WEBPATH='/system/status'
+    CI_WEBPATH=''
  }
  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 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' || : ''',
+            script: '''docker run --rm ghcr.io/linuxserver/alexeiled-skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':nightly 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' ''',
@@ -62,7 +55,7 @@ pipeline {
          env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
          env.PULL_REQUEST = env.CHANGE_ID
-          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/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'
+          env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.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'
        }
        script{
          env.LS_RELEASE_NUMBER = sh(
@@ -72,7 +65,7 @@ pipeline {
        script{
          env.LS_TAG_NUMBER = sh(
            script: '''#! /bin/bash
-                       tagsha=$(git rev-list -n 1 develop-${LS_RELEASE} 2>/dev/null)
+                       tagsha=$(git rev-list -n 1 ${LS_RELEASE} 2>/dev/null)
                       if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
                         echo ${LS_RELEASE_NUMBER}
                       elif [ -z "${GIT_COMMIT}" ]; then
@@ -110,7 +103,7 @@ pipeline {
      steps{
        script{
          env.EXT_RELEASE = sh(
-            script: ''' curl -sL https://radarr.servarr.com/v1/update/develop/changes?runtime=netcore%26os=linuxmusl | jq -r '.[0].version' ''',
+            script: ''' curl -sL https://radarr.servarr.com/v1/update/nightly/changes?os=linux | jq -r '.[0].version' ''',
            returnStdout: true).trim()
            env.RELEASE_LINK = 'custom_command'
        }
@@ -123,37 +116,13 @@ pipeline {
          env.EXT_RELEASE_CLEAN = sh(
            script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g' ''',
            returnStdout: true).trim()
-
-          def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/
-          if (semver.find()) {
-            env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
-          } else {
-            semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/
-            if (semver.find()) {
-              if (semver[0][3]) {
-                env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}"
-              } else if (!semver[0][3] && !semver[0][4]) {
-                env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${(new Date()).format('YYYYMMdd')}"
-              }
-            }
-          }
-
-          if (env.SEMVER != null) {
-            if (BRANCH_NAME != "master" && BRANCH_NAME != "main") {
-              env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}"
-            }
-            println("SEMVER: ${env.SEMVER}")
-          } else {
-            println("No SEMVER detected")
-          }
-
        }
      }
    }
-    // If this is a develop build use live docker endpoints
+    // If this is a nightly build use live docker endpoints
    stage("Set ENV live build"){
      when {
-        branch "develop"
+        branch "nightly"
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -161,22 +130,21 @@ pipeline {
          env.IMAGE = env.DOCKERHUB_IMAGE
          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME
          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-nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          } else {
-            env.CI_TAGS = 'develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+            env.CI_TAGS = 'nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
          }
          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
-          env.EXT_RELEASE_TAG = 'develop-version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'nightly-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
+          env.EXT_RELEASE_TAG = 'nightly-version-' + env.EXT_RELEASE_CLEAN
        }
      }
    }
    // If this is a dev build use dev docker endpoints
    stage("Set ENV dev build"){
      when {
-        not {branch "develop"}
+        not {branch "nightly"}
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@@ -184,15 +152,14 @@ pipeline {
          env.IMAGE = env.DEV_DOCKERHUB_IMAGE
          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME
          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-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-nightly-' + 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
+            env.CI_TAGS = 'nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
          }
          env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.META_TAG = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
-          env.EXT_RELEASE_TAG = 'develop-version-' + env.EXT_RELEASE_CLEAN
+          env.META_TAG = 'nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
+          env.EXT_RELEASE_TAG = 'nightly-version-' + env.EXT_RELEASE_CLEAN
          env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
        }
      }
@@ -207,15 +174,14 @@ pipeline {
          env.IMAGE = env.PR_DOCKERHUB_IMAGE
          env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME
          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 + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm32v7-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
+            env.CI_TAGS = 'amd64-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
          } else {
-            env.CI_TAGS = 'develop-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
+            env.CI_TAGS = 'nightly-' + 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.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          env.META_TAG = 'nightly-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
+          env.EXT_RELEASE_TAG = 'nightly-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/'
        }
@@ -234,23 +200,26 @@ 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-jenkins-builder/master/checkrun.sh | /bin/bash'''
+          sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-shellcheck/master/checkrun.sh | /bin/bash'''
          sh '''#! /bin/bash
+                set -e
+                docker pull ghcr.io/linuxserver/lsiodev-spaces-file-upload:latest
                docker run --rm \
-                  -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" || :'''
+                -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'''
        }
      }
    }
    // Use helper containers to render templated files
    stage('Update-Templates') {
      when {
-        branch "develop"
+        branch "nightly"
        environment name: 'CHANGE_ID', value: ''
        expression {
          env.CONTAINER_NAME != null
@@ -261,13 +230,13 @@ pipeline {
              set -e
              TEMPDIR=$(mktemp -d)
              docker pull ghcr.io/linuxserver/jenkins-builder:latest
-              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=develop -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
+              docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=nightly -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest 
              # Stage 1 - Jenkinsfile update
              if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f develop
+                git checkout -f nightly
                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                git add Jenkinsfile
                git commit -m 'Bot Updating Templated Files'
@@ -280,7 +249,7 @@ pipeline {
                echo "Jenkinsfile is up to date."
              fi
              # Stage 2 - Delete old templates
-              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
+              OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md"
              for i in ${OLD_TEMPLATES}; do
                if [[ -f "${i}" ]]; then
                  TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
@@ -290,14 +259,15 @@ pipeline {
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f develop
+                git checkout -f nightly
+                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                for i in ${TEMPLATES_TO_DELETE}; do
                  git rm "${i}"
                done
                git commit -m 'Bot Updating Templated Files'
                git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
-                echo "Deleting old and deprecated templates"
+                echo "Deleting old templates"
                rm -Rf ${TEMPDIR}
                exit 0
              else
@@ -311,7 +281,7 @@ pipeline {
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f develop
+                git checkout -f nightly
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
@@ -342,17 +312,13 @@ 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, 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' || :
+                  echo "Image is on the ignore list, removing Unraid template"
+                  git rm unraid/${CONTAINER_NAME}.xml || :
+                  git commit -m 'Bot Removing Deprecated Unraid Template' || :
                else
                  cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
                  git add unraid/${CONTAINER_NAME}.xml
@@ -371,7 +337,7 @@ pipeline {
    // Exit the build if the Templated files were just updated
    stage('Template-exit') {
      when {
-        branch "develop"
+        branch "nightly"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'FILES_UPDATED', value: 'true'
        expression {
@@ -384,26 +350,6 @@ 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
       ####################### */
@@ -424,50 +370,18 @@ pipeline {
             "visibility":"public"}' '''
      } 
    }
-    /* #######################
-           Scarf.sh package registry
-       ####################### */
-    // Add package to Scarf.sh and set permissions
-    stage("Scarf.sh package registry"){
-      when {
-        branch "develop"
-        environment name: 'EXIT_STATUS', value: ''
-      }
-      steps{
-        sh '''#! /bin/bash
-              PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/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 \
-                  -H "Authorization: Bearer ${SCARF_TOKEN}" \
-                  -H "Content-Type: application/json" \
-                  -d '{"name":"linuxserver/radarr",\
-                       "shortDescription":"example description",\
-                       "libraryType":"docker",\
-                       "website":"https://github.com/linuxserver/docker-radarr",\
-                       "backendUrl":"https://ghcr.io/linuxserver/radarr",\
-                       "publicUrl":"https://lscr.io/linuxserver/radarr"}' || :
-              else
-                echo "Package already exists on Scarf.sh"
-              fi
-           '''
-      } 
-    }
    /* ###############
       Build Container
       ############### */
    // Build Docker container for push to LS Repo
    stage('Build-Single') {
      when {
-        expression {
-          env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true'
-        }
+        environment name: 'MULTIARCH', value: 'false'
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
        echo "Running on node: ${NODE_NAME}"
-        sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
-        sh "docker buildx build \
+        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\" \
@@ -480,25 +394,21 @@ 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} --platform=linux/amd64 \
+          --no-cache --pull -t ${IMAGE}:${META_TAG} \
          --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
      }
    }
    // Build MultiArch Docker containers for push to LS Repo
    stage('Build-Multi') {
      when {
-        allOf {
-          environment name: 'MULTIARCH', value: 'true'
-          expression { params.PACKAGE_CHECK == 'false' }
-        }
+        environment name: 'MULTIARCH', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
      }
      parallel {
        stage('Build X86') {
          steps {
            echo "Running on node: ${NODE_NAME}"
-            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile"
-            sh "docker buildx build \
+            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\" \
@@ -511,7 +421,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}:amd64-${META_TAG} --platform=linux/amd64 \
+              --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
              --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
          }
        }
@@ -525,8 +435,7 @@ pipeline {
            sh '''#! /bin/bash
                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
               '''
-            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf"
-            sh "docker buildx build \
+            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\" \
@@ -539,18 +448,15 @@ 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.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \
+              --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 '''#! /bin/bash
-                  containers=$(docker ps -aq)
-                  if [[ -n "${containers}" ]]; then
-                    docker stop ${containers}
-                  fi
-                  docker system prune -af --volumes || : '''
+            sh '''docker rmi \
+                  ${IMAGE}:arm32v7-${META_TAG} \
+                  ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
          }
        }
        stage('Build ARM64') {
@@ -563,8 +469,7 @@ pipeline {
            sh '''#! /bin/bash
                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
               '''
-            sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.aarch64"
-            sh "docker buildx build \
+            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\" \
@@ -577,18 +482,15 @@ 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} --platform=linux/arm64 \
+              --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
              --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 '''#! /bin/bash
-                  containers=$(docker ps -aq)
-                  if [[ -n "${containers}" ]]; then
-                    docker stop ${containers}
-                  fi
-                  docker system prune -af --volumes || : '''
+            sh '''docker rmi \
+                  ${IMAGE}:arm64v8-${META_TAG} \
+                  ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
          }
        }
      }
@@ -596,7 +498,7 @@ pipeline {
    // Take the image we just built and dump package versions for comparison
    stage('Update-packages') {
      when {
-        branch "develop"
+        branch "nightly"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
@@ -604,22 +506,27 @@ pipeline {
        sh '''#! /bin/bash
              set -e
              TEMPDIR=$(mktemp -d)
-              if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
+              if [ "${MULTIARCH}" == "true" ]; then
                LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
              else
                LOCAL_CONTAINER=${IMAGE}:${META_TAG}
              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
+              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'
+              fi
              NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
              echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
              if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
-                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f develop
+                git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f nightly
                cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                cd ${TEMPDIR}/${LS_REPO}/
                wait
@@ -643,12 +550,19 @@ pipeline {
    // Exit the build if the package file was just updated
    stage('PACKAGE-exit') {
      when {
-        branch "develop"
+        branch "nightly"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
+        sh '''#! /bin/bash
+              echo "Packages were updated. Cleaning up the image and exiting."
+              if [ "${MULTIARCH}" == "true" ]; then
+                docker rmi ${IMAGE}:amd64-${META_TAG}
+              else
+                docker rmi ${IMAGE}:${META_TAG}
+              fi'''
        script{
          env.EXIT_STATUS = 'ABORTED'
        }
@@ -657,7 +571,7 @@ pipeline {
    // Exit the build if this is just a package check and there are no changes to push
    stage('PACKAGECHECK-exit') {
      when {
-        branch "develop"
+        branch "nightly"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'false'
        environment name: 'EXIT_STATUS', value: ''
@@ -666,6 +580,13 @@ pipeline {
        }
      }
      steps {
+        sh '''#! /bin/bash
+              echo "There are no package updates. Cleaning up the image and exiting."
+              if [ "${MULTIARCH}" == "true" ]; then
+                docker rmi ${IMAGE}:amd64-${META_TAG}
+              else
+                docker rmi ${IMAGE}:${META_TAG}
+              fi'''
        script{
          env.EXIT_STATUS = 'ABORTED'
        }
@@ -687,7 +608,6 @@ 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
@@ -714,8 +634,10 @@ pipeline {
                -e WEB_SCREENSHOT=\"${CI_WEB}\" \
                -e WEB_AUTH=\"${CI_AUTH}\" \
                -e WEB_PATH=\"${CI_WEBPATH}\" \
+                -e DO_REGION="ams3" \
+                -e DO_BUCKET="lsio-ci" \
                -t ghcr.io/linuxserver/ci:latest \
-                python3 test_build.py'''
+                python /ci/ci.py'''
        }
      }
    }
@@ -735,12 +657,6 @@ pipeline {
            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
            usernameVariable: 'DOCKERUSER',
            passwordVariable: 'DOCKERPASS'
-          ],
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'Quay.io-Robot',
-            usernameVariable: 'QUAYUSER',
-            passwordVariable: 'QUAYPASS'
          ]
        ]) {
          retry(5) {
@@ -749,23 +665,24 @@ pipeline {
                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
-                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
+                  for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
                    docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
-                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:develop
+                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:nightly
                    docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                      docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
-                    fi
-                    docker push ${PUSHIMAGE}:develop
+                    docker push ${PUSHIMAGE}:nightly
                    docker push ${PUSHIMAGE}:${META_TAG}
                    docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                     docker push ${PUSHIMAGE}:${SEMVER}
-                    fi
                  done
               '''
          }
+          sh '''#! /bin/bash
+                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
+                  docker rmi \
+                  ${DELETEIMAGE}:${META_TAG} \
+                  ${DELETEIMAGE}:${EXT_RELEASE_TAG} \
+                  ${DELETEIMAGE}:nightly || :
+                done
+             '''
        }
      }
    }
@@ -782,12 +699,6 @@ pipeline {
            credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
            usernameVariable: 'DOCKERUSER',
            passwordVariable: 'DOCKERPASS'
-          ],
-          [
-            $class: 'UsernamePasswordMultiBinding',
-            credentialsId: 'Quay.io-Robot',
-            usernameVariable: 'QUAYUSER',
-            passwordVariable: 'QUAYPASS'
          ]
        ]) {
          retry(5) {
@@ -796,46 +707,35 @@ pipeline {
                  echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
                  echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
                  echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
-                  echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
                  if [ "${CI}" == "false" ]; then
                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
-                    docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
                    docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
+                    docker tag ghcr.io/linuxserver/lsiodev-buildcache: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
+                  for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}"; do
                    docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-develop
-                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
                    docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-develop
-                    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}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-nightly
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-nightly
+                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-nightly
+                    docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                    docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
-                    if [ -n "${SEMVER}" ]; then
-                      docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
-                      docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
-                      docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
-                    fi
                    docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
-                    docker push ${MANIFESTIMAGE}:amd64-develop
                    docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm32v7-develop
-                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                    docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                    docker push ${MANIFESTIMAGE}:arm64v8-develop
+                    docker push ${MANIFESTIMAGE}:amd64-nightly
+                    docker push ${MANIFESTIMAGE}:arm32v7-nightly
+                    docker push ${MANIFESTIMAGE}:arm64v8-nightly
+                    docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
+                    docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
                    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 annotate ${MANIFESTIMAGE}:develop ${MANIFESTIMAGE}:arm64v8-develop --os linux --arch arm64 --variant v8
+                    docker manifest push --purge ${MANIFESTIMAGE}:nightly || :
+                    docker manifest create ${MANIFESTIMAGE}:nightly ${MANIFESTIMAGE}:amd64-nightly ${MANIFESTIMAGE}:arm32v7-nightly ${MANIFESTIMAGE}:arm64v8-nightly
+                    docker manifest annotate ${MANIFESTIMAGE}:nightly ${MANIFESTIMAGE}:arm32v7-nightly --os linux --arch arm
+                    docker manifest annotate ${MANIFESTIMAGE}:nightly ${MANIFESTIMAGE}:arm64v8-nightly --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
@@ -844,28 +744,36 @@ pipeline {
                    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 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 annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
-                    fi
-                    docker manifest push --purge ${MANIFESTIMAGE}:develop
+                    docker manifest push --purge ${MANIFESTIMAGE}:nightly
                    docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
                    docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} 
-                    if [ -n "${SEMVER}" ]; then
-                      docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} 
-                    fi
                  done
               '''
          }
+          sh '''#! /bin/bash
+                for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
+                  docker rmi \
+                  ${DELETEIMAGE}:amd64-${META_TAG} \
+                  ${DELETEIMAGE}:amd64-nightly \
+                  ${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
+                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
+                  ${DELETEIMAGE}:arm32v7-nightly \
+                  ${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
+                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
+                  ${DELETEIMAGE}:arm64v8-nightly \
+                  ${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
+                done
+                docker rmi \
+                ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
+                ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
+             '''
        }
      }
    }
    // If this is a public release tag it in the LS Github
    stage('Github-Tag-Push-Release') {
      when {
-        branch "develop"
+        branch "nightly"
        expression {
          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
        }
@@ -877,14 +785,14 @@ pipeline {
        sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
        -d '{"tag":"'${META_TAG}'",\
             "object": "'${COMMIT_SHA}'",\
-             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to develop",\
+             "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to nightly",\
             "type": "commit",\
             "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
        echo "Pushing New release for Tag"
        sh '''#! /bin/bash
              echo "Updating to ${EXT_RELEASE_CLEAN}" > releasebody.json
              echo '{"tag_name":"'${META_TAG}'",\
-                     "target_commitish": "develop",\
+                     "target_commitish": "nightly",\
                     "name": "'${META_TAG}'",\
                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start
              printf '","draft": false,"prerelease": true}' >> releasebody.json
@@ -929,78 +837,12 @@ pipeline {
    stage('Pull Request Comment') {
      when {
        not {environment name: 'CHANGE_ID', value: ''}
+        environment name: 'CI', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
      }
      steps {
-        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
-            '''
-
+        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}'"}' '''
      }
    }
  }
@@ -1014,26 +856,18 @@ pipeline {
          sh 'echo "build aborted"'
        }
        else if (currentBuild.currentResult == "SUCCESS"){
-          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,\
+          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,\
                 "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://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\
+          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,\
                 "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()
    }
  }
@@ -1,5 +1,5 @@
 <!-- DO NOT EDIT THIS FILE MANUALLY  -->
-<!-- Please read the https://github.com/linuxserver/docker-radarr/blob/develop/.github/CONTRIBUTING.md -->
+<!-- Please read the https://github.com/linuxserver/docker-radarr/blob/nightly/.github/CONTRIBUTING.md -->

 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)

@@ -29,99 +29,94 @@ Find us at:

 # [linuxserver/radarr](https://github.com/linuxserver/docker-radarr)

-[![Scarf.io pulls](https://scarf.sh/installs-badge/linuxserver-ci/linuxserver%2Fradarr?color=94398d&label-color=555555&logo-color=ffffff&style=for-the-badge&package-type=docker)](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fradarr)
 [![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-radarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-radarr)
 [![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-radarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-radarr/releases)
 [![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-radarr/packages)
 [![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-radarr/container_registry)
-[![Quay.io](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/radarr)
+[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/radarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/radarr "Get your own version badge on microbadger.com")
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/radarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/radarr)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/radarr.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/radarr)
-[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-radarr%2Fjob%2Fdevelop%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-radarr/job/develop/)
+[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-radarr%2Fjob%2Fnightly%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-radarr/job/nightly/)
 [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fradarr%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/radarr/latest/index.html)

 [Radarr](https://github.com/Radarr/Radarr) - A fork of Sonarr to work with movies à la Couchpotato.

-[![radarr](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/radarr.png)](https://github.com/Radarr/Radarr)
+[![radarr](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/radarr_alpha.png)](https://github.com/Radarr/Radarr)

 ## Supported Architectures

-We utilise the docker manifest for multi-platform awareness. More information is available from docker [here](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md#manifest-list) and our announcement [here](https://blog.linuxserver.io/2019/02/21/the-lsio-pipeline-project/).
+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/).

-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.
+Simply pulling `ghcr.io/linuxserver/radarr` 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 | Available | Tag |
-| :----: | :----: | ---- |
-| x86-64 | ✅ | amd64-\<version tag\> |
-| arm64 | ✅ | arm64v8-\<version tag\> |
-| armhf | ✅ | arm32v7-\<version tag\> |
+| Architecture | Tag |
+| :----: | --- |
+| x86-64 | amd64-latest |
+| arm64 | arm64v8-latest |
+| armhf | arm32v7-latest |

 ## Version Tags

-This image provides various versions that are available via tags. Please read the descriptions carefully and exercise caution when using unstable or development 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 | Nightly Radarr releases |

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

-### Media folders
+**Special Note**: Following our current folder structure will result in an inability to hardlink from your downloads to your movies folder because they are on seperate volumes. To support hardlinking, ensure that the movies and downloads data are on a single volume. For example, if you have `/mnt/storage/Movies` and `/mnt/storage/downloads/completed/Movies`, you would want something like `/mnt/storage:/media` for your volume. Then you can hardlink from `/media/downloads/completed` to `/media/Movies`.

-We have set `/movies` and `/downloads` as ***optional paths***, this is because it is the easiest way to get started. While easy to use, it has some drawbacks. Mainly losing the ability to hardlink (TL;DR a way for a file to exist in multiple places on the same file system while only consuming one file worth of space), or atomic move (TL;DR instant file moves, rather than copy+delete) files while processing content.
-
-Use the optional paths if you dont understand, or dont want hardlinks/atomic moves.
-
-The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/docker-guide#consistent-and-well-planned-paths) on how to get started with this.
-
-# changelog
+Another item to keep in mind, is that within Radarr itself, you should map your download client folder to your radarr folder. Navigate to **Settings -> Download Client -> Advanced Settings -> Remote Path Mappings**. Add a new mapping, and set: the Host as the same entry of the Host in your download client (for example its IP address), the Remote Path as `/downloads/Movies` (relative to the internal container path), and Local Path as `/media/downloads/completed/Movies`, assuming you have folders to separate your downloaded data types.

 ## Usage

 Here are some example snippets to help you get started creating a container.

-### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
+### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose))
+
+Compatible with docker-compose v2 schemas.

 ```yaml
 ---
 version: "2.1"
 services:
  radarr:
-    image: lscr.io/linuxserver/radarr:develop
+    image: ghcr.io/linuxserver/radarr
    container_name: radarr
    environment:
      - PUID=1000
      - PGID=1000
-      - TZ=Etc/UTC
+      - TZ=Europe/London
    volumes:
      - /path/to/data:/config
-      - /path/to/movies:/movies #optional
-      - /path/to/downloadclient-downloads:/downloads #optional
+      - /path/to/movies:/movies
+      - /path/to/downloadclient-downloads:/downloads
    ports:
      - 7878:7878
    restart: unless-stopped
 ```

-### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/))
+### docker cli

 ```bash
 docker run -d \
  --name=radarr \
  -e PUID=1000 \
  -e PGID=1000 \
-  -e TZ=Etc/UTC \
+  -e TZ=Europe/London \
  -p 7878:7878 \
  -v /path/to/data:/config \
-  -v /path/to/movies:/movies `#optional` \
-  -v /path/to/downloadclient-downloads:/downloads `#optional` \
+  -v /path/to/movies:/movies \
+  -v /path/to/downloadclient-downloads:/downloads \
  --restart unless-stopped \
-  lscr.io/linuxserver/radarr:develop
-
+  ghcr.io/linuxserver/radarr
 ```

 ## Parameters
@@ -133,7 +128,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=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
+| `-e TZ=Europe/London` | Specify a timezone to use EG Europe/London, this is required for Radarr |
 | `-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 +176,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:develop`
+  * `docker inspect -f '{{ index .Config.Labels "build_version" }}' ghcr.io/linuxserver/radarr`

 ## Updating Info

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

 ### Via Docker Run

-* Update the image: `docker pull lscr.io/linuxserver/radarr:develop`
+* Update the image: `docker pull ghcr.io/linuxserver/radarr`
 * 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 +229,7 @@ cd docker-radarr
 docker build \
  --no-cache \
  --pull \
-  -t lscr.io/linuxserver/radarr:develop .
+  -t ghcr.io/linuxserver/radarr:latest .
 ```

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

 ## Versions

-* **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
 * **17.01.21:** - Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information.
-* **11.30.20:** - Publish `develop` tag.
-* **11.28.20:** - Switch to v3 .NET CORE builds (no more mono, `5.14` tag is deprecated). Rebase to Focal (for issues on arm32v7, [see here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal)).
+* **09.27.20:** - Merge Preview into Nightly.
 * **05.04.20:** - Move app to /app.
 * **01.08.19:** - Rebase to Linuxserver LTS mono version.
 * **13.06.19:** - Add env variable for setting umask.
@@ -1,11 +1,12 @@
 ---
+
 # jenkins variables
 project_name: docker-radarr
 external_type: na
-custom_version_command: curl -sL https://radarr.servarr.com/v1/update/develop/changes?runtime=netcore%26os=linuxmusl | jq -r '.[0].version'
+custom_version_command: curl -sL https://radarr.servarr.com/v1/update/nightly/changes?os=linux | jq -r '.[0].version'
 release_type: prerelease
-release_tag: develop
-ls_branch: develop
+release_tag: nightly
+ls_branch: nightly
 repo_vars:
  - BUILD_VERSION_ARG = 'RADARR_RELEASE'
  - LS_USER = 'linuxserver'
@@ -14,7 +15,7 @@ repo_vars:
  - DOCKERHUB_IMAGE = 'linuxserver/radarr'
  - DEV_DOCKERHUB_IMAGE = 'lsiodev/radarr'
  - PR_DOCKERHUB_IMAGE = 'lspipepr/radarr'
-  - DIST_IMAGE = 'alpine'
+  - DIST_IMAGE = 'ubuntu'
  - MULTIARCH='true'
  - CI='true'
  - CI_WEB='true'
@@ -23,6 +24,6 @@ repo_vars:
  - CI_DELAY='120'
  - CI_DOCKERENV='TZ=US/Pacific'
  - CI_AUTH='user:password'
-  - CI_WEBPATH='/system/status'
+  - CI_WEBPATH=''
 sponsor_links:
  - { name: "Radarr", url: "https://opencollective.com/radarr" }
@@ -1,264 +1,153 @@
-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.0.1                  dotnet  
-NLog.Extensions.Logging                                                        5.0.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.0-r0               apk     
-alpine-baselayout-data                                                         3.4.0-r0               apk     
-alpine-keys                                                                    2.4-r1                 apk     
-alpine-release                                                                 3.17.3-r0              apk     
-apk-tools                                                                      2.12.10-r1             apk     
-bash                                                                           5.2.15-r0              apk     
-brotli-libs                                                                    1.0.9-r9               apk     
-busybox                                                                        1.35.0                 binary  
-busybox                                                                        1.35.0-r29             apk     
-busybox-binsh                                                                  1.35.0-r29             apk     
-ca-certificates                                                                20230506-r0            apk     
-ca-certificates-bundle                                                         20230506-r0            apk     
-coreutils                                                                      9.1-r0                 apk     
-curl                                                                           8.1.1-r1               apk     
-icu-data-en                                                                    72.1-r1                apk     
-icu-libs                                                                       72.1-r1                apk     
-jq                                                                             1.6-r2                 apk     
-libacl                                                                         2.3.1-r1               apk     
-libattr                                                                        2.5.1-r2               apk     
-libbsd                                                                         0.11.7-r0              apk     
-libc-utils                                                                     0.7.2-r3               apk     
-libcrypto3                                                                     3.0.8-r4               apk     
-libcurl                                                                        8.1.1-r1               apk     
-libgcc                                                                         12.2.1_git20220924-r4  apk     
-libintl                                                                        0.21.1-r1              apk     
-libmd                                                                          1.0.4-r0               apk     
-libproc                                                                        3.3.17-r2              apk     
-libssl3                                                                        3.0.8-r4               apk     
-libstdc++                                                                      12.2.1_git20220924-r4  apk     
-linux-pam                                                                      1.5.2-r1               apk     
-musl                                                                           1.2.3-r5               apk     
-musl-utils                                                                     1.2.3-r5               apk     
-ncurses-libs                                                                   6.3_p20221119-r1       apk     
-ncurses-terminfo-base                                                          6.3_p20221119-r1       apk     
-netcat-openbsd                                                                 1.130-r4               apk     
-nghttp2-libs                                                                   1.51.0-r0              apk     
-oniguruma                                                                      6.9.8-r0               apk     
-procps                                                                         3.3.17-r2              apk     
-readline                                                                       8.2.0-r0               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.5-r1               apk     
-shadow                                                                         4.13-r0                apk     
-skalibs                                                                        2.12.0.1-r0            apk     
-sqlite-libs                                                                    3.40.1-r0              apk     
-ssl_client                                                                     1.35.0-r29             apk     
-tzdata                                                                         2023c-r0               apk     
-utmps-libs                                                                     0.1.2.0-r1             apk     
-xz                                                                             5.2.9-r0               apk     
-xz-libs                                                                        5.2.9-r0               apk     
-zlib                                                                           1.2.13-r0              apk     
+adduser3.118ubuntu2
+apt2.0.5
+apt-utils2.0.5
+base-files11ubuntu5.3
+base-passwd3.5.47
+bash5.0-6ubuntu1.1
+bsdutils1:2.34-0.1ubuntu9.1
+bzip21.0.8-2
+ca-certificates20210119~20.04.1
+coreutils8.30-3ubuntu2
+curl7.68.0-1ubuntu2.5
+dash0.5.10.2-6
+debconf1.5.73
+debianutils4.9.1
+diffutils1:3.7-3
+dirmngr2.2.19-3ubuntu2.1
+dpkg1.19.7ubuntu3
+e2fsprogs1.45.5-2ubuntu1
+fdisk2.34-0.1ubuntu9.1
+findutils4.7.0-1ubuntu1
+gcc-10-base10.2.0-5ubuntu1~20.04
+gnupg2.2.19-3ubuntu2.1
+gnupg-l10n2.2.19-3ubuntu2.1
+gnupg-utils2.2.19-3ubuntu2.1
+gpg2.2.19-3ubuntu2.1
+gpg-agent2.2.19-3ubuntu2.1
+gpgconf2.2.19-3ubuntu2.1
+gpgsm2.2.19-3ubuntu2.1
+gpgv2.2.19-3ubuntu2.1
+gpg-wks-client2.2.19-3ubuntu2.1
+gpg-wks-server2.2.19-3ubuntu2.1
+grep3.4-1
+gzip1.10-0ubuntu4
+hostname3.23
+init-system-helpers1.57
+jq1.6-1ubuntu0.20.04.1
+krb5-locales1.17-6ubuntu4.1
+libacl12.2.53-6
+libapt-pkg6.02.0.5
+libasn1-8-heimdal7.7.0+dfsg-1ubuntu1
+libassuan02.5.3-7ubuntu2
+libattr11:2.4.48-5
+libaudit11:2.8.5-2ubuntu6
+libaudit-common1:2.8.5-2ubuntu6
+libblkid12.34-0.1ubuntu9.1
+libbrotli11.0.7-6ubuntu0.1
+libbz2-1.01.0.8-2
+libc62.31-0ubuntu9.2
+libcap-ng00.7.9-2.1build1
+libc-bin2.31-0ubuntu9.2
+libcom-err21.45.5-2ubuntu1
+libcrypt11:4.4.10-10ubuntu4
+libcurl3-gnutls7.68.0-1ubuntu2.5
+libcurl47.68.0-1ubuntu2.5
+libdb5.35.3.28+dfsg1-0.6ubuntu2
+libdebconfclient00.251ubuntu1
+libext2fs21.45.5-2ubuntu1
+libfdisk12.34-0.1ubuntu9.1
+libffi73.3-4
+libgcc-s110.2.0-5ubuntu1~20.04
+libgcrypt201.8.5-5ubuntu1
+libgmp102:6.2.0+dfsg-4
+libgnutls303.6.13-2ubuntu1.3
+libgpg-error01.37-1
+libgssapi3-heimdal7.7.0+dfsg-1ubuntu1
+libgssapi-krb5-21.17-6ubuntu4.1
+libhcrypto4-heimdal7.7.0+dfsg-1ubuntu1
+libheimbase1-heimdal7.7.0+dfsg-1ubuntu1
+libheimntlm0-heimdal7.7.0+dfsg-1ubuntu1
+libhogweed53.5.1+really3.5.1-2ubuntu0.1
+libhx509-5-heimdal7.7.0+dfsg-1ubuntu1
+libicu6666.1-2ubuntu2
+libidn2-02.2.0-2
+libjq11.6-1ubuntu0.20.04.1
+libk5crypto31.17-6ubuntu4.1
+libkeyutils11.6-6ubuntu1
+libkrb5-26-heimdal7.7.0+dfsg-1ubuntu1
+libkrb5-31.17-6ubuntu4.1
+libkrb5support01.17-6ubuntu4.1
+libksba81.3.5-2
+libldap-2.4-22.4.49+dfsg-2ubuntu1.8
+libldap-common2.4.49+dfsg-2ubuntu1.8
+liblz4-11.9.2-2
+liblzma55.2.4-1ubuntu1
+libmediainfo0v519.09+dfsg-2build1
+libmms00.6.4-3
+libmount12.34-0.1ubuntu9.1
+libncurses66.2-0ubuntu2
+libncursesw66.2-0ubuntu2
+libnettle73.5.1+really3.5.1-2ubuntu0.1
+libnghttp2-141.40.0-1build1
+libnpth01.6-1
+libonig56.9.4-1
+libp11-kit00.23.20-1ubuntu0.1
+libpam0g1.3.1-5ubuntu4.1
+libpam-modules1.3.1-5ubuntu4.1
+libpam-modules-bin1.3.1-5ubuntu4.1
+libpam-runtime1.3.1-5ubuntu4.1
+libpcre2-8-010.34-7
+libpcre32:8.39-12build1
+libprocps82:3.3.16-1ubuntu2.1
+libpsl50.21.0-1ubuntu1
+libreadline88.0-4
+libroken18-heimdal7.7.0+dfsg-1ubuntu1
+librtmp12.4+20151223.gitfa8646d.1-2build1
+libsasl2-22.1.27+dfsg-2
+libsasl2-modules2.1.27+dfsg-2
+libsasl2-modules-db2.1.27+dfsg-2
+libseccomp22.5.1-1ubuntu1~20.04.1
+libselinux13.0-1build2
+libsemanage13.0-1build2
+libsemanage-common3.0-1build2
+libsepol13.0-1
+libsmartcols12.34-0.1ubuntu9.1
+libsqlite3-03.31.1-4ubuntu0.2
+libss21.45.5-2ubuntu1
+libssh-40.9.3-2ubuntu2.1
+libssl1.11.1.1f-1ubuntu2.3
+libstdc++610.2.0-5ubuntu1~20.04
+libsystemd0245.4-4ubuntu3.6
+libtasn1-64.16.0-2
+libtinfo66.2-0ubuntu2
+libtinyxml2-6a7.0.0+dfsg-1build1
+libudev1245.4-4ubuntu3.6
+libunistring20.9.10-2
+libuuid12.34-0.1ubuntu9.1
+libwind0-heimdal7.7.0+dfsg-1ubuntu1
+libzen0v50.4.37-1build1
+libzstd11.4.4+dfsg-3ubuntu0.1
+locales2.31-0ubuntu9.2
+login1:4.8.1-1ubuntu5.20.04
+logsave1.45.5-2ubuntu1
+lsb-base11.1.0ubuntu2
+mawk1.3.4.20200120-2
+mount2.34-0.1ubuntu9.1
+ncurses-base6.2-0ubuntu2
+ncurses-bin6.2-0ubuntu2
+openssl1.1.1f-1ubuntu2.3
+passwd1:4.8.1-1ubuntu5.20.04
+perl-base5.30.0-9ubuntu0.2
+pinentry-curses1.1.0-3build1
+procps2:3.3.16-1ubuntu2.1
+publicsuffix20200303.0012-1
+readline-common8.0-4
+sed4.7-1
+sensible-utils0.0.12+nmu1
+sqlite33.31.1-4ubuntu0.2
+sysvinit-utils2.96-2.1ubuntu1
+tar1.30+dfsg-7ubuntu0.20.04.1
+tzdata2021a-0ubuntu0.20.04
+ubuntu-keyring2020.02.11.4
+util-linux2.34-0.1ubuntu9.1
+zlib1g1:1.2.11.dfsg-2ubuntu1.2
@@ -3,7 +3,7 @@
 # project information
 project_name: radarr
 project_url: "https://github.com/Radarr/Radarr"
-project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/radarr.png"
+project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/radarr_alpha.png"
 project_blurb: |
  [{{ project_name|capitalize }}]({{ project_url }}) - A fork of Sonarr to work with movies à la Couchpotato.
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
@@ -19,16 +19,13 @@ development_versions: true
 development_versions_items:
  - { tag: "latest", desc: "Stable Radarr releases" }
  - { tag: "develop", desc: "Radarr releases from their develop branch" }
-  - { tag: "nightly", desc: "Radarr releases from their nightly branch" }
+  - { tag: "nightly", desc: "Nightly Radarr releases" }

 # container parameters
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
  - { vol_path: "/config", vol_host_path: "/path/to/data", desc: "Database and Radarr configs" }
-
-opt_param_usage_include_vols: true
-opt_param_volumes:
  - { vol_path: "/movies", vol_host_path: "/path/to/movies", desc: "Location of Movie library on disk (See note in Application setup)" }
  - { vol_path: "/downloads", vol_host_path: "/path/to/downloadclient-downloads", desc: "Location of download managers output directory (See note in Application setup)" }

@@ -46,23 +43,14 @@ app_setup_block_enabled: true
 app_setup_block: |
  Access the webui at `<your-ip>:7878`, for more information check out [Radarr](https://github.com/Radarr/Radarr).

-  ### Media folders
+  **Special Note**: Following our current folder structure will result in an inability to hardlink from your downloads to your movies folder because they are on seperate volumes. To support hardlinking, ensure that the movies and downloads data are on a single volume. For example, if you have `/mnt/storage/Movies` and `/mnt/storage/downloads/completed/Movies`, you would want something like `/mnt/storage:/media` for your volume. Then you can hardlink from `/media/downloads/completed` to `/media/Movies`.

-  We have set `/movies` and `/downloads` as ***optional paths***, this is because it is the easiest way to get started. While easy to use, it has some drawbacks. Mainly losing the ability to hardlink (TL;DR a way for a file to exist in multiple places on the same file system while only consuming one file worth of space), or atomic move (TL;DR instant file moves, rather than copy+delete) files while processing content.
-  
-  Use the optional paths if you dont understand, or dont want hardlinks/atomic moves.
-  
-  The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/docker-guide#consistent-and-well-planned-paths) on how to get started with this.
+  Another item to keep in mind, is that within Radarr itself, you should map your download client folder to your radarr folder. Navigate to **Settings -> Download Client -> Advanced Settings -> Remote Path Mappings**. Add a new mapping, and set: the Host as the same entry of the Host in your download client (for example its IP address), the Remote Path as `/downloads/Movies` (relative to the internal container path), and Local Path as `/media/downloads/completed/Movies`, assuming you have folders to separate your downloaded data types.

-  # changelog
+# changelog
 changelogs:
-  - { 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" }
  - { date: "17.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
-  - { date: "11.30.20:", desc: "Publish `develop` tag." }
-  - { date: "11.28.20:", desc: "Switch to v3 .NET CORE builds (no more mono, `5.14` tag is deprecated). Rebase to Focal (for issues on arm32v7, [see here](https://docs.linuxserver.io/faq#my-host-is-incompatible-with-images-based-on-ubuntu-focal))." }
+  - { date: "09.27.20:", desc: "Merge Preview into Nightly." }
  - { date: "05.04.20:", desc: "Move app to /app." }
  - { date: "01.08.19:", desc: "Rebase to Linuxserver LTS mono version." }
  - { date: "13.06.19:", desc: "Add env variable for setting umask." }
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bash
+
+# permissions
+chown -R abc:abc \
+	/config 
@@ -1,6 +0,0 @@
-#!/usr/bin/with-contenv bash
-# shellcheck shell=bash
-
-# permissions
-lsiown -R abc:abc \
-    /config
@@ -1 +0,0 @@
-oneshot
@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/init-radarr-config/run
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if [[ $(curl -sL "http://localhost:7878/ping" | jq -r '.status' 2>/dev/null) = "OK" ]]; then
-    exit 0
-else
-    exit 1
-fi
@@ -1 +0,0 @@
-3
@@ -1,7 +0,0 @@
-#!/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
@@ -1 +0,0 @@
-longrun
@@ -0,0 +1,10 @@
+#!/usr/bin/with-contenv bash
+
+if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then
+  echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021"
+  umask ${UMASK_SET}
+fi
+
+exec \
+	s6-setuidgid abc /app/radarr/bin/Radarr \
+	-nobrowser -data=/config
Author	SHA1	Message	Date
LinuxServer-CI	f8e41fb21f	Bot Updating Package Versions	2021-05-04 14:43:36 +01:00
LinuxServer-CI	68ece5b5f5	Bot Updating Package Versions	2021-04-27 16:00:33 +01:00
LinuxServer-CI	68fb51b0b4	Bot Updating Package Versions	2021-04-22 22:09:01 -04:00
LinuxServer-CI	aa3f06613d	Bot Updating Templated Files	2021-04-17 22:58:34 +01:00
LinuxServer-CI	5a313bac77	Bot Updating Templated Files	2021-04-17 21:57:07 +00:00
LinuxServer-CI	2e7ee4c600	Bot Updating Package Versions	2021-04-13 10:06:24 +00:00
LinuxServer-CI	8bf4b0e56a	Bot Updating Package Versions	2021-04-08 17:06:20 +01:00
LinuxServer-CI	e360bb6626	Bot Updating Package Versions	2021-03-31 13:20:12 +00:00
LinuxServer-CI	3734319ff4	Bot Updating Package Versions	2021-03-30 05:05:26 -04:00
LinuxServer-CI	a402838292	Bot Updating Package Versions	2021-03-09 13:10:09 +00:00
LinuxServer-CI	4b10c2c9f5	Bot Updating Package Versions	2021-02-25 04:01:07 +00:00
LinuxServer-CI	8b523e3fce	Bot Updating Package Versions	2021-02-21 20:00:31 +00:00
LinuxServer-CI	10baed0faf	Bot Updating Templated Files	2021-02-14 01:59:35 -05:00
LinuxServer-CI	af2d31d162	Bot Updating Templated Files	2021-02-14 06:58:14 +00:00
LinuxServer-CI	d948a3d684	Bot Updating Package Versions	2021-02-10 13:16:19 +00:00
LinuxServer-CI	a8bbc6b789	Bot Updating Package Versions	2021-02-03 04:09:08 +00:00
LinuxServer-CI	3f95eab940	Bot Updating Package Versions	2021-01-30 21:03:57 +00:00
LinuxServer-CI	4a6d8165f4	Bot Updating Package Versions	2021-01-27 15:03:32 -05:00
LinuxServer-CI	a23ead6b2c	Bot Updating Package Versions	2021-01-20 04:40:39 -05:00
aptalcaandGitHub	a171c5c219	Merge pull request #133 from linuxserver/nightly-deprecate-umask_set Deprecate UMASK_SET in favor of UMASK in baseimage	2021-01-18 08:30:38 -05:00
Roxedus	892b39acb5	Deprecate UMASK_SET in favor of UMASK in baseimage	2021-01-18 09:49:00 +01:00
LinuxServer-CI	342996e1d0	Bot Updating Package Versions	2021-01-17 03:50:12 +00:00
LinuxServer-CI	6bb53a8070	Bot Updating Templated Files	2021-01-12 23:12:47 -05:00
LinuxServer-CI	2731005b9e	Bot Updating Package Versions	2021-01-09 02:15:04 +00:00
LinuxServer-CI	10c80ab64e	Bot Updating Templated Files	2020-12-16 01:36:05 +00:00
LinuxServer-CI	850793627a	Bot Updating Templated Files	2020-12-16 01:34:25 +00:00
LinuxServer-CI	3bf0ef49f1	Bot Updating Package Versions	2020-12-11 00:02:53 -05:00
aptalcaandGitHub	ba0559d527	Merge pull request #115 from linuxserver/nightly-wf add trigger workflows	2020-11-29 16:24:00 -05:00
aptalca	9b155dd18a	add trigger workflows	2020-11-29 16:08:07 -05:00
LinuxServer-CI	562ba7eedc	Bot Updating Package Versions	2020-11-22 00:30:38 -05:00
LinuxServer-CI	e0e2f7d0dc	Bot Updating Package Versions	2020-11-15 06:29:09 +00:00
LinuxServer-CI	ec9612149e	Bot Updating Package Versions	2020-11-06 08:09:31 +00:00
LinuxServer-CI	01e8e0c34a	Bot Updating Package Versions	2020-11-05 23:29:23 -05:00
LinuxServer-CI	920ba763f1	Bot Updating Package Versions	2020-11-02 10:04:12 -05:00
LinuxServer-CI	8f5f0c2482	Bot Updating Templated Files	2020-11-02 14:57:24 +00:00
thelamer	4f4ae14086	update baseimages	2020-11-02 06:56:01 -08:00
LinuxServer-CI	f0193fd2bc	Bot Updating Package Versions	2020-10-11 07:28:48 +00:00
LinuxServer-CI	f829b39612	Bot Updating Templated Files	2020-10-03 22:27:29 -04:00
LinuxServer-CI	c7d861aac4	Bot Updating Templated Files	2020-10-04 03:26:20 +01:00
aptalcaandGitHub	7865395fed	Merge pull request #108 from linuxserver/readme-updates-nightly Readme Updates nightly	2020-09-27 10:45:01 -04:00
Eric Nemchik	96578d19c3	Readme Updates	2020-09-27 09:13:50 -05:00
Eric NemchikandGitHub	d8150a9f10	Merge pull request #105 from hotio/nightly Merge Preview into Nightly, following the upstream changes	2020-09-27 08:21:11 -05:00
hotio	8fe4ce5012	Merge Preview into Nightly, following the upstream changes	2020-09-27 11:06:50 +02:00
LinuxServer-CI	887ac04154	Bot Updating Package Versions	2020-09-26 23:28:05 -04:00
LinuxServer-CI	8ce69a5d1d	Bot Updating Package Versions	2020-09-11 15:53:15 +01:00
LinuxServer-CI	a70f65e90f	Bot Updating Package Versions	2020-09-04 14:58:55 +00:00
LinuxServer-CI	c6d694921b	Bot Updating Package Versions	2020-08-21 14:54:51 +00:00
LinuxServer-CI	07c389bb5a	Bot Updating Templated Files	2020-08-21 14:52:08 +00:00
LinuxServer-CI	cb7dd1cba5	Bot Updating Package Versions	2020-08-14 14:53:35 +00:00
LinuxServer-CI	6c71f0fb56	Bot Updating Package Versions	2020-08-07 15:06:38 +00:00
LinuxServer-CI	9767f9046d	Bot Updating Templated Files	2020-08-07 10:52:53 -04:00
LinuxServer-CI	4afecf9d44	Bot Updating Templated Files	2020-08-07 14:51:49 +00:00
LinuxServer-CI	5d52be30be	Bot Updating Templated Files	2020-07-25 19:44:05 -04:00
thelamer	5117b42b21	remove leftover params	2020-07-25 16:43:06 -07:00
thelamer	6b3578b999	use custom version command	2020-07-25 16:43:06 -07:00
thelamer	a0ab197103	update url ingestion to use official radarr server	2020-07-25 16:43:06 -07:00
LinuxServer-CI	3d890e1d15	Bot Updating Package Versions	2020-07-24 10:53:35 -04:00
LinuxServer-CI	d4c596e45b	Bot Updating Package Versions	2020-07-17 14:53:29 +00:00
LinuxServer-CI	ebfb4e7a72	Bot Updating Package Versions	2020-07-10 10:53:08 -04:00
LinuxServer-CI	d20149309b	Bot Updating Package Versions	2020-07-03 03:29:26 +00:00
LinuxServer-CI	2b305117fa	Bot Updating Package Versions	2020-06-26 01:28:58 +00:00
LinuxServer-CI	7b73319645	Bot Updating Package Versions	2020-06-19 10:53:16 -04:00
LinuxServer-CI	a01f4ac98e	Bot Updating Package Versions	2020-06-12 10:53:03 -04:00
LinuxServer-CI	18e29460cf	Bot Updating Package Versions	2020-06-05 10:54:33 -04:00
LinuxServer-CI	a20998a9e2	Bot Updating Templated Files	2020-06-05 16:51:44 +02:00
LinuxServer-CI	1fc26e8fac	Bot Updating Package Versions	2020-05-29 10:54:26 -04:00
LinuxServer-CI	a8756368bb	Bot Updating Templated Files	2020-05-29 14:52:12 +00:00
LinuxServer-CI	04ba0f9dc1	Bot Updating Package Versions	2020-05-22 14:53:26 +00:00
LinuxServer-CI	e0b62c181b	Bot Updating Package Versions	2020-05-15 14:55:10 +00:00
LinuxServer-CI	52383907b0	Bot Updating Package Versions	2020-05-01 14:54:43 +00:00
LinuxServer-CI	7b0a4f1460	Bot Updating Templated Files	2020-05-01 14:52:03 +00:00
LinuxServer-CI	1c9c839764	Bot Updating Package Versions	2020-04-24 14:59:15 +00:00
LinuxServer-CI	9e17fd8dbb	Bot Updating Templated Files	2020-04-09 21:44:35 -04:00
aptalcaandGitHub	d206b55599	Merge pull request #92 from linuxserver/nightly-app Move app to /app	2020-04-09 21:43:37 -04:00
Eric Nemchik	1c28dcb854	Fix perms on /app	2020-04-08 16:39:29 -05:00
LinuxServer-CI	66390375c5	Bot Updating Package Versions	2020-04-08 15:55:10 -05:00
LinuxServer-CI	d01e5cc33f	Bot Updating Templated Files	2020-04-08 20:50:03 +00:00
LinuxServer-CI	a175a663de	Bot Updating Templated Files	2020-04-08 15:48:49 -05:00
aptalcaandGitHub	e8a3687095	Merge pull request #96 from linuxserver/nemchik-patch-2 Add donate link	2020-04-08 16:47:41 -04:00
Eric NemchikandGitHub	0996e01afd	Remove blank line	2020-04-07 19:30:11 -05:00
Eric NemchikandGitHub	dc2eaeb950	Add donate link	2020-04-07 17:43:34 -05:00
Eric Nemchik	9a4ee6ae29	Move app to /app	2020-04-05 02:44:10 -05:00
LinuxServer-CI	93c521ad0e	Bot Updating Package Versions	2020-03-27 15:55:51 +00:00
LinuxServer-CI	eb40db12fa	Bot Updating Package Versions	2020-03-20 11:55:03 -04:00
LinuxServer-CI	a6ab0faeee	Bot Updating Package Versions	2020-03-13 16:54:25 +01:00
LinuxServer-CI	4af2b824e3	Bot Updating Package Versions	2020-02-21 15:53:49 +00:00
LinuxServer-CI	4cd68c3af1	Bot Updating Package Versions	2020-02-14 10:58:44 -05:00
LinuxServer-CI	761ca70088	Bot Updating Package Versions	2020-02-07 15:55:51 +00:00
LinuxServer-CI	b5429c4214	Bot Updating Package Versions	2020-01-31 01:28:14 +00:00
LinuxServer-CI	e3d5aba2f6	Bot Updating Package Versions	2020-01-24 20:31:34 +00:00
LinuxServer-CI	3778fd4560	Bot Updating Package Versions	2020-01-17 15:54:10 +00:00
LinuxServer-CI	305f765910	Bot Updating Package Versions	2019-12-20 15:55:12 +00:00
LinuxServer-CI	df0ed1a354	Bot Updating Package Versions	2019-12-06 16:54:00 +01:00
LinuxServer-CI	a4c650e743	Bot Updating Templated Files	2019-11-29 15:51:47 +00:00
LinuxServer-CI	cfb1a97331	Bot Updating Package Versions	2019-11-22 15:54:04 +00:00
LinuxServer-CI	4cac216d3f	Bot Updating Package Versions	2019-11-15 16:55:00 +01:00
Jameel Al-AzizandRyan Kuba	59d71722a2	Remove extra volumes from the Dockerfile Specifying the volumes in the Dockerfile is unnecessary and can lead to excessive orphaned volume if the user chooses to use different paths at runtime.	2019-11-02 20:28:19 -07:00
LinuxServer-CI	a87d46e109	Bot Updating Package Versions	2019-11-01 11:55:39 -04:00
LinuxServer-CI	ae5a74967b	Bot Updating Templated Files	2019-11-01 15:51:42 +00:00
LinuxServer-CI	f9b2fe4394	Bot Updating Package Versions	2019-10-25 15:53:58 +01:00
LinuxServer-CI	7f9ff3cb9c	Bot Updating Package Versions	2019-10-18 16:57:14 +02:00
LinuxServer-CI	c5e5d96454	Bot Updating Package Versions	2019-10-11 10:58:37 -04:00
LinuxServer-CI	f6fc2388b4	Bot Updating Templated Files	2019-10-11 10:52:46 -04:00
LinuxServer-CI	e005681700	Bot Updating Templated Files	2019-10-11 10:51:55 -04:00
LinuxServer-CI	ea5941593e	Bot Updating Package Versions	2019-10-04 15:53:58 +01:00
LinuxServer-CI	784584ca72	Bot Updating Package Versions	2019-09-27 15:54:59 +01:00
LinuxServer-CI	258bb8eaf4	Bot Updating Package Versions	2019-09-20 15:57:12 +01:00
LinuxServer-CI	17f54b7fbb	Bot Updating Package Versions	2019-09-13 10:59:24 -04:00
LinuxServer-CI	fe41d81cfa	Bot Updating Package Versions	2019-09-06 10:33:19 -04:00
LinuxServer-CI	c5f51669fe	Bot Updating Templated Files	2019-09-01 17:27:05 +01:00
LinuxServer-CI	18819be44c	Bot Updating Templated Files	2019-09-01 12:26:07 -04:00
LinuxServer-CI	9a972bed92	Bot Updating Package Versions	2019-08-23 10:56:12 -04:00
LinuxServer-CI	e93dca1060	Bot Updating Package Versions	2019-08-14 20:40:05 -04:00
LinuxServer-CI	ad97cf59c5	Bot Updating Package Versions	2019-08-09 15:58:11 +01:00
LinuxServer-CI	55fe13a669	Bot Updating Package Versions	2019-08-03 16:17:13 -04:00
aptalcaandGitHub	1721d2b9f8	Merge pull request #58 from thelamer/nightly nightly - adding LTS branch for us to freeze a stable mono for downstream	2019-08-03 16:09:33 -04:00
LinuxServer-CI	4d04550700	Bot Updating Package Versions	2019-08-02 15:54:56 +01:00
thelamer	49e12f8e39	adding LTS branch for us to freeze a stable mono for downstream	2019-08-01 17:48:05 -07:00
LinuxServer-CI	12ed199768	Bot Updating Package Versions	2019-07-26 15:55:55 +01:00
LinuxServer-CI	607858218f	Bot Updating Package Versions	2019-07-19 14:54:35 +00:00
LinuxServer-CI	d9ebf0c1aa	Bot Updating Package Versions	2019-07-10 09:27:23 +00:00
LinuxServer-CI	5d2bf82390	Bot Updating Package Versions	2019-07-05 16:54:46 +02:00
LinuxServer-CI	20edd5bf96	Bot Updating Templated Files	2019-07-05 16:52:04 +02:00
LinuxServer-CI	043fba52df	Bot Updating Package Versions	2019-06-28 14:53:45 +00:00
LinuxServer-CI	5d82ae5dc7	Bot Updating Package Versions	2019-06-21 10:53:00 -04:00
Mateusz FurdynaandRyan Kuba	c5b1a7fa19	Fix umask - get umask from environment Makes it consistent with other linuxserver.io images.	2019-06-16 15:15:49 -07:00
LinuxServer-CI	cc33298c07	Bot Updating Package Versions	2019-06-14 14:55:11 +00:00
LinuxServer-CI	debb8e93c3	Bot Updating Templated Files	2019-06-07 15:51:46 +01:00
LinuxServer-CI	3c7c1396a0	Bot Updating Package Versions	2019-05-24 10:58:25 -04:00
LinuxServer-CI	888a890812	Bot Updating Templated Files	2019-05-24 10:53:48 -04:00
LinuxServer-CI	960b1cb86e	Bot Updating Templated Files	2019-05-24 10:52:20 -04:00
LinuxServer-CI	dd007fea97	Bot Updating Package Versions	2019-05-10 16:21:17 -04:00
chbmbandGitHub	713c07b940	Merge pull request #46 from thelamer/nightly rebase to bionic	2019-05-10 21:18:39 +01:00
thelamer	5bec90ad8c	rebase to bionic	2019-05-10 12:44:39 -07:00
LinuxServer-CI	b7e2fc7c94	Bot Updating Templated Files	2019-05-03 14:51:48 +00:00
LinuxServer-CI	c43853c59c	Bot Updating Package Versions	2019-05-02 11:29:03 +00:00
LinuxServer-CI	c57efee802	Bot Updating Templated Files	2019-05-02 11:26:10 +00:00
LinuxServer-CI	81188e7a5f	Bot Updating Package Versions	2019-04-26 14:59:11 +00:00
LinuxServer-CI	2f3192be82	Bot Updating Package Versions	2019-04-19 16:15:49 +01:00
LinuxServer-CI	5df677945a	Bot Updating Package Versions	2019-04-12 10:53:26 -04:00
LinuxServer-CI	458cf61903	Bot Updating Package Versions	2019-04-05 15:57:32 +01:00
LinuxServer-CI	7720298b16	Bot Updating Package Versions	2019-03-24 20:00:33 +00:00
aptalcaandGitHub	ba8c87ac52	Merge pull request #41 from thelamer/nightly Switching to new Base images, shift to arm32v7 tag.	2019-03-24 15:53:32 -04:00
thelamer	5deee328da	Switching to new Base images, shift to arm32v7 tag.	2019-03-23 16:46:38 -07:00
LinuxServer-CI	dbfc4e82e4	Bot Updating Package Versions	2019-03-22 15:53:29 +00:00
LinuxServer-CI	497ba114d3	Bot Updating Package Versions	2019-03-19 10:27:36 +00:00
LinuxServer-CI	73db3c615b	Bot Updating Package Versions	2019-03-08 13:52:06 -05:00
LinuxServer-CI	e47f12b6dd	Bot Updating Templated Files	2019-03-08 15:51:31 +00:00
LinuxServer-CI	2858a95438	Bot Updating Templated Files	2019-03-01 15:51:38 +00:00
LinuxServer-CI	f166e87bc5	Bot Updating Package Versions	2019-02-24 00:29:05 +00:00
LinuxServer-CI	2acc6f5529	Bot Updating Package Versions	2019-02-15 15:55:45 +00:00
LinuxServer-CI	84ffb4b63a	Bot Updating Templated Files	2019-02-15 15:51:42 +00:00
LinuxServer-CI	8f4aede79c	Bot Updating Templated Files	2019-02-08 15:51:44 +00:00
j0nnymoeandGitHub	d7034dd900	Merge pull request #35 from linuxserver/nightly-version fix radarr version arg, switch to https for download url	2019-01-30 21:32:50 +00:00
aptalca	d06182a46e	ignore curl cert errors until we figure out issue with builders	2019-01-30 16:21:19 -05:00
aptalca	9de23e5083	fix radarr version arg, switch to https for download url	2019-01-30 15:10:42 -05:00
LinuxServer-CI	9503c75d0e	Bot Updating Package Versions	2019-01-30 19:54:55 +00:00
LinuxServer-CI	3e8a7b8ba0	Bot Updating Templated Files	2019-01-30 14:50:54 -05:00
aptalcaandGitHub	2159faca8c	Merge pull request #33 from linuxserver/pipeline-nightly Pipeline nightly	2019-01-30 14:50:02 -05:00
Ryan KubaandGitHub	7979057fb0	Merge branch 'nightly' into pipeline-nightly	2019-01-21 00:51:17 -08:00
thelamer	e5c74cce45	updating branch with current pipeline build logic in prep for PR	2019-01-20 20:27:40 -08:00
thelamer	8bf4376134	bad json path for version endpoint	2018-09-09 22:15:57 -07:00
thelamer	295c24752e	bad variable in credentials for live build server	2018-09-09 22:12:44 -07:00
thelamer	a0d8b5b656	adding nightly branch to pipeline builds	2018-09-09 22:11:16 -07:00
sparklyballs	732f9294ed	change baseimages to new ubuntu style	2018-03-14 18:44:09 +00:00
sparklyballsandGitHub	4d482fa103	Merge pull request #22 from linuxserver/develop Develop	2018-02-24 18:15:04 +00:00
sparklyballs	d62defbf12	add variable to choose branch	2018-02-24 17:57:45 +00:00
sparklyballs	0c406a6ed8	first push up of develop branch	2018-02-24 16:36:44 +00:00
				`@@ -1 +0,0 @@`
				`/etc/s6-overlay/s6-rc.d/init-radarr-config/run`