From 3268c5fa75193d9d26c476a02b2869946defcbcc Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 19 Dec 2022 17:44:28 +0000 Subject: [PATCH] Rebase develop to 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 + .../dependencies.d/init-lidarr-config | 0 .../init-lidarr-config/dependencies.d/init-config | 0 .../s6-rc.d/init-lidarr-config/run} | 3 ++- root/etc/s6-overlay/s6-rc.d/init-lidarr-config/type | 1 + root/etc/s6-overlay/s6-rc.d/init-lidarr-config/up | 1 + .../s6-rc.d/svc-lidarr/dependencies.d/init-services | 0 .../s6-overlay/s6-rc.d/svc-lidarr/notification-fd | 1 + root/etc/s6-overlay/s6-rc.d/svc-lidarr/run | 7 +++++++ root/etc/s6-overlay/s6-rc.d/svc-lidarr/type | 1 + .../s6-rc.d/user/contents.d/init-lidarr-config | 0 .../s6-overlay/s6-rc.d/user/contents.d/svc-lidarr | 0 root/etc/services.d/lidarr/run | 5 ----- 20 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 .github/workflows/call_invalid_helper.yml create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-lidarr-config create mode 100644 root/etc/s6-overlay/s6-rc.d/init-lidarr-config/dependencies.d/init-config rename root/etc/{cont-init.d/30-config => s6-overlay/s6-rc.d/init-lidarr-config/run} (56%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-lidarr-config/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-lidarr-config/up create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-lidarr/dependencies.d/init-services create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-lidarr/notification-fd create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-lidarr/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-lidarr/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-lidarr-config create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-lidarr delete mode 100644 root/etc/services.d/lidarr/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 330cbb9..92f1a6c 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 \ chromaprint \ icu-libs \ sqlite-libs && \ @@ -35,12 +35,12 @@ RUN \ echo "**** cleanup ****" && \ rm -rf \ /app/lidarr/bin/Lidarr.Update \ - /tmp/* \ - /var/tmp/* + /tmp/* # copy local files COPY root/ / # ports and volumes EXPOSE 8686 + VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 844707f..8be0179 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 \ chromaprint \ icu-libs \ sqlite-libs && \ @@ -35,12 +35,12 @@ RUN \ echo "**** cleanup ****" && \ rm -rf \ /app/lidarr/bin/Lidarr.Update \ - /tmp/* \ - /var/tmp/* + /tmp/* # copy local files COPY root/ / # ports and volumes EXPOSE 8686 + VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index f0b3eaa..c96b562 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 \ chromaprint \ icu-libs \ sqlite-libs && \ @@ -35,12 +35,12 @@ RUN \ echo "**** cleanup ****" && \ rm -rf \ /app/lidarr/bin/Lidarr.Update \ - /tmp/* \ - /var/tmp/* + /tmp/* # copy local files COPY root/ / # ports and volumes EXPOSE 8686 + VOLUME /config diff --git a/Jenkinsfile b/Jenkinsfile index ea5a8e1..9b17f98 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 cb7b2ed..942f432 100644 --- a/README.md +++ b/README.md @@ -249,6 +249,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **06.05.22:** - Rebase develop branch to Alpine 3.17, migrate to s6v3. * **06.05.22:** - Rebase develop branch to Alpine. * **01.08.21:** - Add libchromaprint-tools. * **11.07.21:** - Make the paths clearer to the user. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index b23f00f..9ef25b6 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: "Lidarr", url: "https://opencollective.com/lidarr" } diff --git a/readme-vars.yml b/readme-vars.yml index d939a12..792523a 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -59,6 +59,7 @@ app_setup_block: | # changelog changelogs: + - { date: "06.05.22:", desc: "Rebase develop branch to Alpine 3.17, migrate to s6v3." } - { date: "06.05.22:", desc: "Rebase develop branch to Alpine." } - { date: "01.08.21:", desc: "Add libchromaprint-tools." } - { date: "11.07.21:", desc: "Make the paths clearer to the user." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-lidarr-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-lidarr-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-lidarr-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-lidarr-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-lidarr-config/run old mode 100644 new mode 100755 similarity index 56% rename from root/etc/cont-init.d/30-config rename to root/etc/s6-overlay/s6-rc.d/init-lidarr-config/run index 05c4707..efea851 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/s6-overlay/s6-rc.d/init-lidarr-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/init-lidarr-config/type b/root/etc/s6-overlay/s6-rc.d/init-lidarr-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-lidarr-config/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-lidarr-config/up b/root/etc/s6-overlay/s6-rc.d/init-lidarr-config/up new file mode 100644 index 0000000..3a838da --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-lidarr-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-lidarr-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-lidarr/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-lidarr/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-lidarr/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-lidarr/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-lidarr/notification-fd @@ -0,0 +1 @@ +3 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-lidarr/run b/root/etc/s6-overlay/s6-rc.d/svc-lidarr/run new file mode 100755 index 0000000..4f464e2 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-lidarr/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 8686" \ + cd /app/lidarr/bin s6-setuidgid abc /app/lidarr/bin/Lidarr \ + -nobrowser -data=/config diff --git a/root/etc/s6-overlay/s6-rc.d/svc-lidarr/type b/root/etc/s6-overlay/s6-rc.d/svc-lidarr/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-lidarr/type @@ -0,0 +1 @@ +longrun diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-lidarr-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-lidarr-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-lidarr b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-lidarr new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/lidarr/run b/root/etc/services.d/lidarr/run deleted file mode 100644 index 47e95cb..0000000 --- a/root/etc/services.d/lidarr/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/with-contenv bash - -exec \ - s6-setuidgid abc /app/lidarr/bin/Lidarr \ - -nobrowser -data=/config