From a12ea5060a7fae3b7eaf156cfbd3af886da4ca92 Mon Sep 17 00:00:00 2001
From: TheSpad <git@spad.co.uk>
Date: Mon, 19 Dec 2022 17:31:27 +0000
Subject: [PATCH] Rebase nightly to 3.17

---
 .github/workflows/call_invalid_helper.yml          | 12 ++++++++++++
 Dockerfile                                         |  7 ++++---
 Dockerfile.aarch64                                 |  7 ++++---
 Dockerfile.armhf                                   |  7 ++++---
 README.md                                          |  1 +
 readme-vars.yml                                    |  1 +
 root/etc/s6-overlay/s6-rc.d/init-radarr-config/run |  3 ++-
 root/etc/s6-overlay/s6-rc.d/svc-radarr/run         |  1 +
 8 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 .github/workflows/call_invalid_helper.yml

diff --git a/.github/workflows/call_invalid_helper.yml b/.github/workflows/call_invalid_helper.yml
new file mode 100644
index 0000000..773767c
--- /dev/null
+++ b/.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
diff --git a/Dockerfile b/Dockerfile
index 6621372..81aac01 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -32,8 +34,7 @@ RUN \
   echo "**** cleanup ****" && \
   rm -rf \
     /app/radarr/bin/Radarr.Update \
-    /tmp/* \
-    /var/tmp/*
+    /tmp/*
 
 # copy local files
 COPY root/ /
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index c946c3f..874512a 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -32,8 +34,7 @@ RUN \
   echo "**** cleanup ****" && \
   rm -rf \
     /app/radarr/bin/Radarr.Update \
-    /tmp/* \
-    /var/tmp/*
+    /tmp/*
 
 # copy local files
 COPY root/ /
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index a9aec30..afe201b 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -32,8 +34,7 @@ RUN \
   echo "**** cleanup ****" && \
   rm -rf \
     /app/radarr/bin/Radarr.Update \
-    /tmp/* \
-    /var/tmp/*
+    /tmp/*
 
 # copy local files
 COPY root/ /
diff --git a/README.md b/README.md
index d898a72..37e023e 100644
--- a/README.md
+++ b/README.md
@@ -245,6 +245,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **19.12.22:** - Rebase nightly to Alpine 3.17.
 * **27.10.22:** - Rebase nightly to Alpine 3.16, migrate to s6v3.
 * **04.02.22:** - Rebase nightly branch to Alpine.
 * **13.12.21:** - Remove unused dependencies.
diff --git a/readme-vars.yml b/readme-vars.yml
index 64f837f..46eff08 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -56,6 +56,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "19.12.22:", desc: "Rebase nightly to Alpine 3.17." }
   - { date: "27.10.22:", desc: "Rebase nightly to Alpine 3.16, migrate to s6v3." }
   - { date: "04.02.22:", desc: "Rebase nightly branch to Alpine." }
   - { date: "13.12.21:", desc: "Remove unused dependencies." }
diff --git a/root/etc/s6-overlay/s6-rc.d/init-radarr-config/run b/root/etc/s6-overlay/s6-rc.d/init-radarr-config/run
index 05c4707..efea851 100755
--- a/root/etc/s6-overlay/s6-rc.d/init-radarr-config/run
+++ b/root/etc/s6-overlay/s6-rc.d/init-radarr-config/run
@@ -1,5 +1,6 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 # permissions
-chown -R abc:abc \
+lsiown -R abc:abc \
     /config
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-radarr/run b/root/etc/s6-overlay/s6-rc.d/svc-radarr/run
index 8d7cbdf..88ca84a 100755
--- a/root/etc/s6-overlay/s6-rc.d/svc-radarr/run
+++ b/root/etc/s6-overlay/s6-rc.d/svc-radarr/run
@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 exec \
     s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 7878" \