From 3e5df71d6b12b578450c1e7fb60edd7bef6a4a73 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 19 Dec 2022 17:34:49 +0000 Subject: [PATCH] Rebase develop tp 3.17, migrate to s6v3 --- .github/workflows/call_invalid_helper.yml | 12 ++++++++++++ Dockerfile | 10 +++++----- Dockerfile.aarch64 | 10 +++++----- Dockerfile.armhf | 10 +++++----- Jenkinsfile | 2 +- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 1 + root/etc/cont-init.d/30-config | 5 ----- .../dependencies.d/init-radarr-config | 0 .../init-radarr-config/dependencies.d/init-config | 0 root/etc/s6-overlay/s6-rc.d/init-radarr-config/run | 6 ++++++ root/etc/s6-overlay/s6-rc.d/init-radarr-config/type | 1 + root/etc/s6-overlay/s6-rc.d/init-radarr-config/up | 1 + .../s6-rc.d/svc-radarr/dependencies.d/init-services | 0 .../s6-overlay/s6-rc.d/svc-radarr/notification-fd | 1 + root/etc/s6-overlay/s6-rc.d/svc-radarr/run | 7 +++++++ root/etc/s6-overlay/s6-rc.d/svc-radarr/type | 1 + .../s6-rc.d/user/contents.d/init-radarr-config | 0 .../s6-overlay/s6-rc.d/user/contents.d/svc-radarr | 0 root/etc/services.d/radarr/run | 7 ------- 21 files changed, 48 insertions(+), 29 deletions(-) create mode 100644 .github/workflows/call_invalid_helper.yml delete mode 100644 root/etc/cont-init.d/30-config create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-radarr-config create mode 100644 root/etc/s6-overlay/s6-rc.d/init-radarr-config/dependencies.d/init-config create mode 100755 root/etc/s6-overlay/s6-rc.d/init-radarr-config/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-radarr-config/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-radarr-config/up create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-radarr/dependencies.d/init-services create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-radarr/notification-fd create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-radarr/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-radarr/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-radarr-config create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-radarr delete mode 100644 root/etc/services.d/radarr/run 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 8afa3fb..95d3c23 100644 --- a/Dockerfile +++ b/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 diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 7b674a6..4eb4323 100644 --- a/Dockerfile.aarch64 +++ b/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 diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 8201df3..d0c2f02 100644 --- a/Dockerfile.armhf +++ b/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 diff --git a/Jenkinsfile b/Jenkinsfile index 23d62bd..56651da 100644 --- a/Jenkinsfile +++ b/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 diff --git a/README.md b/README.md index 2427b23..caa4a3e 100644 --- a/README.md +++ b/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 diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 34af07c..0fbb138 100644 --- a/jenkins-vars.yml +++ b/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" } diff --git a/readme-vars.yml b/readme-vars.yml index 9023cd1..0584624 100644 --- a/readme-vars.yml +++ b/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" } diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config deleted file mode 100644 index aa3208d..0000000 --- a/root/etc/cont-init.d/30-config +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/with-contenv bash - -# permissions -chown -R abc:abc \ - /config 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/s6-overlay/s6-rc.d/init-radarr-config/run b/root/etc/s6-overlay/s6-rc.d/init-radarr-config/run new file mode 100755 index 0000000..efea851 --- /dev/null +++ b/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 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..88ca84a --- /dev/null +++ b/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 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 fd6d9d4..0000000 --- a/root/etc/services.d/radarr/run +++ /dev/null @@ -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