diff --git a/Dockerfile b/Dockerfile index 287a33c..6621372 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 radarr ****" && \ @@ -42,4 +40,5 @@ COPY root/ / # ports and volumes EXPOSE 7878 + VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 4138f60..c946c3f 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 radarr ****" && \ @@ -42,4 +40,5 @@ COPY root/ / # ports and volumes EXPOSE 7878 + VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index d4efbad..a9aec30 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 @@ -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 radarr ****" && \ @@ -42,4 +40,5 @@ COPY root/ / # ports and volumes EXPOSE 7878 + VOLUME /config diff --git a/README.md b/README.md index 91e8d59..d898a72 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 +* **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. * **17.10.21:** - Remove `UMASK_SET`. diff --git a/readme-vars.yml b/readme-vars.yml index ef36046..64f837f 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -56,6 +56,7 @@ app_setup_block: | # changelog changelogs: + - { 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." } - { date: "17.10.21:", desc: "Remove `UMASK_SET`." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-radarr-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-radarr-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-radarr-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-radarr-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-radarr-config/run old mode 100644 new mode 100755 similarity index 80% rename from root/etc/cont-init.d/30-config rename to root/etc/s6-overlay/s6-rc.d/init-radarr-config/run index aa3208d..05c4707 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/s6-overlay/s6-rc.d/init-radarr-config/run @@ -1,5 +1,5 @@ #!/usr/bin/with-contenv bash -# permissions +# permissions chown -R abc:abc \ /config diff --git a/root/etc/s6-overlay/s6-rc.d/init-radarr-config/type b/root/etc/s6-overlay/s6-rc.d/init-radarr-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-radarr-config/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-radarr-config/up b/root/etc/s6-overlay/s6-rc.d/init-radarr-config/up new file mode 100644 index 0000000..bb49764 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-radarr-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-radarr-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-radarr/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-radarr/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-radarr/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-radarr/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-radarr/notification-fd @@ -0,0 +1 @@ +3 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-radarr/run b/root/etc/s6-overlay/s6-rc.d/svc-radarr/run new file mode 100755 index 0000000..8d7cbdf --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-radarr/run @@ -0,0 +1,6 @@ +#!/usr/bin/with-contenv 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 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-radarr/type b/root/etc/s6-overlay/s6-rc.d/svc-radarr/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-radarr/type @@ -0,0 +1 @@ +longrun diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-radarr-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-radarr-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-radarr b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-radarr new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/radarr/run b/root/etc/services.d/radarr/run deleted file mode 100644 index e2d5e7b..0000000 --- a/root/etc/services.d/radarr/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/with-contenv bash - -exec \ - s6-setuidgid abc /app/radarr/bin/Radarr \ - -nobrowser -data=/config