Merge pull request #192 from linuxserver/develop-3.17

.github/workflows/call_invalid_helper.yml

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

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -14,8 +16,6 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 RUN \
   echo "**** install packages ****" && \
   apk add -U --upgrade --no-cache \
-    curl \
-    jq \
     icu-libs \
     sqlite-libs && \
   echo "**** install radarr ****" && \
@@ -34,12 +34,12 @@ RUN \
   echo "**** cleanup ****" && \
   rm -rf \
     /app/radarr/bin/Radarr.Update \
-    /tmp/* \
-    /var/tmp/*
+    /tmp/*
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 7878
+
 VOLUME /config

Dockerfile.aarch64

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -14,8 +16,6 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 RUN \
   echo "**** install packages ****" && \
   apk add -U --upgrade --no-cache \
-    curl \
-    jq \
     icu-libs \
     sqlite-libs && \
   echo "**** install radarr ****" && \
@@ -34,12 +34,12 @@ RUN \
   echo "**** cleanup ****" && \
   rm -rf \
     /app/radarr/bin/Radarr.Update \
-    /tmp/* \
-    /var/tmp/*
+    /tmp/*
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 7878
+
 VOLUME /config

Dockerfile.armhf

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -14,8 +16,6 @@ ENV XDG_CONFIG_HOME="/config/xdg"
 RUN \
   echo "**** install packages ****" && \
   apk add -U --upgrade --no-cache \
-    curl \
-    jq \
     icu-libs \
     sqlite-libs && \
   echo "**** install radarr ****" && \
@@ -34,12 +34,12 @@ RUN \
   echo "**** cleanup ****" && \
   rm -rf \
     /app/radarr/bin/Radarr.Update \
-    /tmp/* \
-    /var/tmp/*
+    /tmp/*
 
 # copy local files
 COPY root/ /
 
 # ports and volumes
 EXPOSE 7878
+
 VOLUME /config

Jenkinsfile

@@ -33,7 +33,7 @@ pipeline {
     CI_DELAY='120'
     CI_DOCKERENV='TZ=US/Pacific'
     CI_AUTH='user:password'
-    CI_WEBPATH=''
+    CI_WEBPATH='/system/status'
   }
   stages {
     // Setup all the basic environment variables needed for the build

README.md

@@ -247,6 +247,7 @@ 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

jenkins-vars.yml

@@ -23,6 +23,6 @@ repo_vars:
   - CI_DELAY='120'
   - CI_DOCKERENV='TZ=US/Pacific'
   - CI_AUTH='user:password'
-  - CI_WEBPATH=''
+  - CI_WEBPATH='/system/status'
 sponsor_links:
   - { name: "Radarr", url: "https://opencollective.com/radarr" }

readme-vars.yml

@@ -56,6 +56,7 @@ app_setup_block: |
 
   # 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" }

root/etc/cont-init.d/30-config

@@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-# permissions
-chown -R abc:abc \
-    /config

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

@@ -0,0 +1,6 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+# permissions
+lsiown -R abc:abc \
+    /config

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

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

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

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

root/etc/s6-overlay/s6-rc.d/svc-radarr/notification-fd

@@ -0,0 +1 @@
+3

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

@@ -0,0 +1,7 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 7878" \
+        cd /app/radarr/bin s6-setuidgid abc /app/radarr/bin/Radarr \
+        -nobrowser -data=/config

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

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

root/etc/services.d/radarr/run

@@ -1,7 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-cd /app/radarr/bin || exit
-
-exec \
-    s6-setuidgid abc /app/radarr/bin/Radarr \
-    -nobrowser -data=/config