From 4b45552ec35977292a5e4019a77ab2c219df6f46 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Thu, 27 Oct 2022 18:32:34 +0100 Subject: [PATCH 1/2] Rebase v4 to 3.16, migrate to s6v3 --- Dockerfile | 5 ++--- Dockerfile.aarch64 | 5 ++--- Dockerfile.armhf | 3 ++- README.md | 2 +- readme-vars.yml | 2 +- .../init-sonarr-config/dependencies.d/legacy-services | 0 .../s6-rc.d/init-sonarr-config/run} | 4 ++-- root-armhf/etc/s6-overlay/s6-rc.d/init-sonarr-config/type | 1 + root-armhf/etc/s6-overlay/s6-rc.d/init-sonarr-config/up | 1 + .../s6-rc.d/user2/contents.d/init-sonarr-config | 0 root-armhf/etc/services.d/armless/run | 8 -------- .../init-config-end/dependencies.d/init-sonarr-config | 0 .../s6-rc.d/init-sonarr-config/dependencies.d/init-config | 0 .../s6-rc.d/init-sonarr-config/run} | 3 ++- root/etc/s6-overlay/s6-rc.d/init-sonarr-config/type | 1 + root/etc/s6-overlay/s6-rc.d/init-sonarr-config/up | 1 + .../s6-rc.d/svc-sonarr/dependencies.d/init-services | 0 root/etc/s6-overlay/s6-rc.d/svc-sonarr/notification-fd | 1 + root/etc/s6-overlay/s6-rc.d/svc-sonarr/run | 6 ++++++ root/etc/s6-overlay/s6-rc.d/svc-sonarr/type | 1 + .../s6-overlay/s6-rc.d/user/contents.d/init-sonarr-config | 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-sonarr | 0 root/etc/services.d/sonarr/run | 7 ------- 23 files changed, 24 insertions(+), 27 deletions(-) create mode 100644 root-armhf/etc/s6-overlay/s6-rc.d/init-sonarr-config/dependencies.d/legacy-services rename root-armhf/etc/{cont-init.d/50-armless => s6-overlay/s6-rc.d/init-sonarr-config/run} (81%) mode change 100644 => 100755 create mode 100644 root-armhf/etc/s6-overlay/s6-rc.d/init-sonarr-config/type create mode 100644 root-armhf/etc/s6-overlay/s6-rc.d/init-sonarr-config/up create mode 100644 root-armhf/etc/s6-overlay/s6-rc.d/user2/contents.d/init-sonarr-config delete mode 100755 root-armhf/etc/services.d/armless/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-sonarr-config create mode 100644 root/etc/s6-overlay/s6-rc.d/init-sonarr-config/dependencies.d/init-config rename root/etc/{cont-init.d/30-config => s6-overlay/s6-rc.d/init-sonarr-config/run} (65%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-sonarr-config/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-sonarr-config/up create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-sonarr/dependencies.d/init-services create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-sonarr/notification-fd create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-sonarr/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-sonarr/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-sonarr-config create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-sonarr delete mode 100755 root/etc/services.d/sonarr/run diff --git a/Dockerfile b/Dockerfile index 9ad06c7..31ed6d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:3.15 +FROM ghcr.io/linuxserver/baseimage-alpine:3.16 # set version label ARG BUILD_DATE @@ -14,8 +14,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 sonarr ****" && \ @@ -41,4 +39,5 @@ COPY root/ / # ports and volumes EXPOSE 8989 + VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 798e031..854f3ff 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.16 # set version label ARG BUILD_DATE @@ -14,8 +14,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 sonarr ****" && \ @@ -41,4 +39,5 @@ COPY root/ / # ports and volumes EXPOSE 8989 + VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 81a21cc..297556d 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 +FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.16 # set version label ARG BUILD_DATE @@ -12,4 +12,5 @@ COPY root-armhf/ / # ports and volumes EXPOSE 8989 + VOLUME /config diff --git a/README.md b/README.md index 83ce646..4f90a87 100644 --- a/README.md +++ b/README.md @@ -237,7 +237,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **18.09.22:** - Rebase develop to Alpine and bump to v4. +* **27.10.22:** - Rebase v4 to Alpine 3.16, migrate to s6v3. * **03.08.22:** - Deprecate armhf. * **02.08.22:** - Rebase develop branch to Ubuntu Focal due to dropping of mono support on Alpine. * **20.02.22:** - Rebase develop branch to Alpine. diff --git a/readme-vars.yml b/readme-vars.yml index 89f04b1..7b33941 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -44,7 +44,7 @@ app_setup_block: | # changelog changelogs: - - { date: "18.09.22:", desc: "Rebase develop to Alpine and bump to v4." } + - { date: "27.10.22:", desc: "Rebase v4 to Alpine 3.16, migrate to s6v3." } - { date: "03.08.22:", desc: "Deprecate armhf." } - { date: "02.08.22:", desc: "Rebase develop branch to Ubuntu Focal due to dropping of mono support on Alpine." } - { date: "20.02.22:", desc: "Rebase develop branch to Alpine." } diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/init-sonarr-config/dependencies.d/legacy-services b/root-armhf/etc/s6-overlay/s6-rc.d/init-sonarr-config/dependencies.d/legacy-services new file mode 100644 index 0000000..e69de29 diff --git a/root-armhf/etc/cont-init.d/50-armless b/root-armhf/etc/s6-overlay/s6-rc.d/init-sonarr-config/run old mode 100644 new mode 100755 similarity index 81% rename from root-armhf/etc/cont-init.d/50-armless rename to root-armhf/etc/s6-overlay/s6-rc.d/init-sonarr-config/run index 31e79d6..e751e59 --- a/root-armhf/etc/cont-init.d/50-armless +++ b/root-armhf/etc/s6-overlay/s6-rc.d/init-sonarr-config/run @@ -5,8 +5,8 @@ cat <<-EOF ******************************************************** * * * !!!! * - * This image no longers supports * - * 32 bit ARM due to a lack of upstream packages * + * This Sonarr image does not support * + * 32 bit ARM due to lack of available OS packages * * * * * ******************************************************** diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/init-sonarr-config/type b/root-armhf/etc/s6-overlay/s6-rc.d/init-sonarr-config/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root-armhf/etc/s6-overlay/s6-rc.d/init-sonarr-config/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/init-sonarr-config/up b/root-armhf/etc/s6-overlay/s6-rc.d/init-sonarr-config/up new file mode 100644 index 0000000..b2b0bd0 --- /dev/null +++ b/root-armhf/etc/s6-overlay/s6-rc.d/init-sonarr-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-sonarr-config/run \ No newline at end of file diff --git a/root-armhf/etc/s6-overlay/s6-rc.d/user2/contents.d/init-sonarr-config b/root-armhf/etc/s6-overlay/s6-rc.d/user2/contents.d/init-sonarr-config new file mode 100644 index 0000000..e69de29 diff --git a/root-armhf/etc/services.d/armless/run b/root-armhf/etc/services.d/armless/run deleted file mode 100755 index 647da28..0000000 --- a/root-armhf/etc/services.d/armless/run +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/with-contenv bash - -if [[ -n $ISCI ]]; then - sleep 180 -fi - -exec \ - s6-svscanctl -t /run/service/ diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-sonarr-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-sonarr-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/dependencies.d/init-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/cont-init.d/30-config b/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/run old mode 100644 new mode 100755 similarity index 65% rename from root/etc/cont-init.d/30-config rename to root/etc/s6-overlay/s6-rc.d/init-sonarr-config/run index fbd633f..8fa414f --- a/root/etc/cont-init.d/30-config +++ b/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/run @@ -2,4 +2,5 @@ # permissions chown -R abc:abc \ - /app/sonarr/bin + /app/sonarr/bin \ + /config diff --git a/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/type b/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/type new file mode 100644 index 0000000..3d92b15 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/up b/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/up new file mode 100644 index 0000000..b2b0bd0 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-sonarr-config/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-sonarr/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-sonarr/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-sonarr/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-sonarr/notification-fd new file mode 100644 index 0000000..e440e5c --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-sonarr/notification-fd @@ -0,0 +1 @@ +3 \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/svc-sonarr/run b/root/etc/s6-overlay/s6-rc.d/svc-sonarr/run new file mode 100755 index 0000000..f3dce0f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-sonarr/run @@ -0,0 +1,6 @@ +#!/usr/bin/with-contenv bash + +exec \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8989" \ + cd /app/sonarr/bin s6-setuidgid abc /app/sonarr/bin/Sonarr \ + -nobrowser -data=/config diff --git a/root/etc/s6-overlay/s6-rc.d/svc-sonarr/type b/root/etc/s6-overlay/s6-rc.d/svc-sonarr/type new file mode 100644 index 0000000..1780f9f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-sonarr/type @@ -0,0 +1 @@ +longrun \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-sonarr-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-sonarr-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-sonarr b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-sonarr new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/sonarr/run b/root/etc/services.d/sonarr/run deleted file mode 100755 index f14ae6f..0000000 --- a/root/etc/services.d/sonarr/run +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/with-contenv bash - -cd /app/sonarr/bin || exit - -exec \ - s6-setuidgid abc /app/sonarr/bin/Sonarr \ - -nobrowser -data=/config From d71c445ab5c5dfef6194e826eda319587b0036e9 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Thu, 27 Oct 2022 19:00:54 +0100 Subject: [PATCH 2/2] App dir chown shouldn't be needed with dotnet --- root/etc/s6-overlay/s6-rc.d/init-sonarr-config/run | 1 - 1 file changed, 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/run b/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/run index 8fa414f..aa3208d 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/run @@ -2,5 +2,4 @@ # permissions chown -R abc:abc \ - /app/sonarr/bin \ /config