From 377aefea18e5d9876139df45b89d30cde39ec1a5 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Thu, 27 Oct 2022 18:55:08 +0100 Subject: [PATCH 1/4] Rebase nightly to 3.16, migrate to s6v3 --- Dockerfile | 5 ++--- Dockerfile.aarch64 | 5 ++--- Dockerfile.armhf | 5 ++--- README.md | 2 ++ readme-vars.yml | 2 ++ .../init-config-end/dependencies.d/init-lidarr-config | 0 .../s6-rc.d/init-lidarr-config/dependencies.d/init-config | 0 root/etc/s6-overlay/s6-rc.d/init-lidarr-config/run | 5 +++++ 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 root/etc/s6-overlay/s6-rc.d/svc-lidarr/notification-fd | 1 + root/etc/s6-overlay/s6-rc.d/svc-lidarr/run | 6 ++++++ root/etc/s6-overlay/s6-rc.d/svc-lidarr/type | 1 + .../s6-overlay/s6-rc.d/user/contents.d/init-lidarr-config | 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-lidarr | 0 root/etc/services.d/lidarr/run | 0 17 files changed, 25 insertions(+), 9 deletions(-) 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 create mode 100755 root/etc/s6-overlay/s6-rc.d/init-lidarr-config/run 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 mode change 100644 => 100755 root/etc/services.d/lidarr/run diff --git a/Dockerfile b/Dockerfile index 386065d..c64d800 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 \ chromaprint \ icu-libs \ sqlite-libs && \ @@ -43,4 +41,5 @@ COPY root/ / # ports and volumes EXPOSE 8686 + VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6a61f38..57c4ce7 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 \ chromaprint \ icu-libs \ sqlite-libs && \ @@ -43,4 +41,5 @@ COPY root/ / # ports and volumes EXPOSE 8686 + VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 1b393f5..165f498 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -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 \ chromaprint \ icu-libs \ sqlite-libs && \ @@ -43,4 +41,5 @@ COPY root/ / # ports and volumes EXPOSE 8686 + VOLUME /config diff --git a/README.md b/README.md index 8faa66d..9aff1fe 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,7 @@ This image provides various versions that are available via tags. Please read th | Tag | Available | Description | | :----: | :----: |--- | | latest | ✅ | Stable Lidarr releases. | +| develop | ✅ | Develop Lidarr Releases. | | nightly | ✅ | Nightly Lidarr Releases. | ## Application Setup @@ -248,6 +249,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **27.10.22:** - Rebase nightly Alpine 3.16, migrate to s6v3. * **04.02.22:** - Rebase nightly branch to Alpine. * **30.12.21:** - Add nightly-alpine branch. * **01.08.21:** - Add libchromaprint-tools. diff --git a/readme-vars.yml b/readme-vars.yml index a8f54f4..9cc5089 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -17,6 +17,7 @@ available_architectures: development_versions: true development_versions_items: - { tag: "latest", desc: "Stable Lidarr releases." } + - { tag: "develop", desc: "Develop Lidarr Releases." } - { tag: "nightly", desc: "Nightly Lidarr Releases." } # container parameters @@ -58,6 +59,7 @@ app_setup_block: | # changelog changelogs: + - { date: "27.10.22:", desc: "Rebase nightly Alpine 3.16, migrate to s6v3." } - { date: "04.02.22:", desc: "Rebase nightly branch to Alpine." } - { date: "30.12.21:", desc: "Add nightly-alpine branch." } - { date: "01.08.21:", desc: "Add libchromaprint-tools." } 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/s6-overlay/s6-rc.d/init-lidarr-config/run b/root/etc/s6-overlay/s6-rc.d/init-lidarr-config/run new file mode 100755 index 0000000..05c4707 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-lidarr-config/run @@ -0,0 +1,5 @@ +#!/usr/bin/with-contenv bash + +# permissions +chown -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..a9cce0b --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-lidarr/run @@ -0,0 +1,6 @@ +#!/usr/bin/with-contenv 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 old mode 100644 new mode 100755 From 514da7f43d07f07226f0cec858db44346cf0d653 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Thu, 27 Oct 2022 18:55:53 +0100 Subject: [PATCH 2/4] Delete legacy folders --- root/etc/cont-init.d/30-config | 5 ----- root/etc/services.d/lidarr/run | 10 ---------- 2 files changed, 15 deletions(-) delete mode 100644 root/etc/cont-init.d/30-config delete mode 100755 root/etc/services.d/lidarr/run diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config deleted file mode 100644 index 05c4707..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/services.d/lidarr/run b/root/etc/services.d/lidarr/run deleted file mode 100755 index 4ea5359..0000000 --- a/root/etc/services.d/lidarr/run +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/with-contenv bash - -if [ -n "${UMASK_SET}" ] && [ -z "${UMASK}" ]; then - echo -e "You are using a legacy method of defining umask\nplease update your environment variable from UMASK_SET to UMASK\nto keep the functionality after July 2021" - umask ${UMASK_SET} -fi - -exec \ - s6-setuidgid abc /app/lidarr/bin/Lidarr \ - -nobrowser -data=/config From 73270a773ccc8eca834ce3887150db1772ca81a6 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Thu, 27 Oct 2022 18:56:40 +0100 Subject: [PATCH 3/4] Fix changelog typo --- readme-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme-vars.yml b/readme-vars.yml index 9cc5089..83dcf9e 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -59,7 +59,7 @@ app_setup_block: | # changelog changelogs: - - { date: "27.10.22:", desc: "Rebase nightly Alpine 3.16, migrate to s6v3." } + - { 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: "30.12.21:", desc: "Add nightly-alpine branch." } - { date: "01.08.21:", desc: "Add libchromaprint-tools." } From e1b46b0b2ee377195ae749239dbeb120acd54bf7 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Thu, 27 Oct 2022 20:29:55 +0100 Subject: [PATCH 4/4] Update CI path --- jenkins-vars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins-vars.yml b/jenkins-vars.yml index ba608b5..f88d59b 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" }