From a1ada136931aba004044ff60d0af22ea4db4591d Mon Sep 17 00:00:00 2001 From: TheSpad Date: Thu, 27 Oct 2022 19:46:45 +0100 Subject: [PATCH] Rebase nightly to 3.16, migrate to s6v3 --- Dockerfile | 5 ++--- Dockerfile.aarch64 | 5 ++--- Dockerfile.armhf | 5 ++--- README.md | 4 +++- readme-vars.yml | 4 +++- .../init-config-end/dependencies.d/init-readarr-config | 0 .../s6-rc.d/init-readarr-config/dependencies.d/init-config | 0 .../s6-rc.d/init-readarr-config/run} | 2 +- root/etc/s6-overlay/s6-rc.d/init-readarr-config/type | 1 + root/etc/s6-overlay/s6-rc.d/init-readarr-config/up | 1 + .../s6-rc.d/svc-readarr/dependencies.d/init-services | 0 root/etc/s6-overlay/s6-rc.d/svc-readarr/notification-fd | 1 + root/etc/s6-overlay/s6-rc.d/svc-readarr/run | 6 ++++++ root/etc/s6-overlay/s6-rc.d/svc-readarr/type | 1 + .../s6-overlay/s6-rc.d/user/contents.d/init-prowlarr-config | 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-prowlarr | 0 root/etc/services.d/readarr/run | 5 ----- 17 files changed, 23 insertions(+), 17 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-readarr-config create mode 100644 root/etc/s6-overlay/s6-rc.d/init-readarr-config/dependencies.d/init-config rename root/etc/{cont-init.d/30-config => s6-overlay/s6-rc.d/init-readarr-config/run} (80%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-readarr-config/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-readarr-config/up create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-readarr/dependencies.d/init-services create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-readarr/notification-fd create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-readarr/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-readarr/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-prowlarr-config create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-prowlarr delete mode 100644 root/etc/services.d/readarr/run diff --git a/Dockerfile b/Dockerfile index bdcd5c7..5bf3db3 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 readarr ****" && \ @@ -42,4 +40,5 @@ COPY root/ / # ports and volumes EXPOSE 8787 + VOLUME /config diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 8159863..4639fd8 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 readarr ****" && \ @@ -42,4 +40,5 @@ COPY root/ / # ports and volumes EXPOSE 8787 + VOLUME /config diff --git a/Dockerfile.armhf b/Dockerfile.armhf index b8155af..1ebcd42 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 readarr ****" && \ @@ -42,4 +40,5 @@ COPY root/ / # ports and volumes EXPOSE 8787 + VOLUME /config diff --git a/README.md b/README.md index 0d1e542..ed31552 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,8 @@ This image provides various versions that are available via tags. Please read th | Tag | Available | Description | | :----: | :----: |--- | | latest | ❌ | | -| nightly | ✅ | Nightly Readarr releases | +| develop | ✅ | Readarr releases from their develop branch | +| nightly | ✅ | Readarr releases from their nightly branch | ## Application Setup @@ -244,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. * **21.01.22:** - Remove chromaprint as it's no longer a required dependency. * **01.01.22:** - Add chromaprint for audio fingerprinting. diff --git a/readme-vars.yml b/readme-vars.yml index 7b34335..09fb6a6 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -16,7 +16,8 @@ available_architectures: # development version development_versions: true development_versions_items: - - { tag: "nightly", desc: "Nightly Readarr releases" } + - { tag: "develop", desc: "Readarr releases from their develop branch" } + - { tag: "nightly", desc: "Readarr releases from their nightly branch" } # container parameters param_container_name: "{{ project_name }}" @@ -53,6 +54,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: "21.01.22:", desc: "Remove chromaprint as it's no longer a required dependency." } - { date: "01.01.22:", desc: "Add chromaprint for audio fingerprinting." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-readarr-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-readarr-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-readarr-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-readarr-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-readarr-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-readarr-config/run index aa3208d..05c4707 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/s6-overlay/s6-rc.d/init-readarr-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-readarr-config/type b/root/etc/s6-overlay/s6-rc.d/init-readarr-config/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-readarr-config/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-readarr-config/up b/root/etc/s6-overlay/s6-rc.d/init-readarr-config/up new file mode 100644 index 0000000..5223f33 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-readarr-config/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-readarr-config/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-readarr/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-readarr/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-readarr/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-readarr/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-readarr/notification-fd @@ -0,0 +1 @@ +3 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-readarr/run b/root/etc/s6-overlay/s6-rc.d/svc-readarr/run new file mode 100755 index 0000000..67b008d --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-readarr/run @@ -0,0 +1,6 @@ +#!/usr/bin/with-contenv bash + +exec \ + s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8787" \ + cd /app/readarr/bin s6-setuidgid abc /app/readarr/bin/Readarr \ + -nobrowser -data=/config diff --git a/root/etc/s6-overlay/s6-rc.d/svc-readarr/type b/root/etc/s6-overlay/s6-rc.d/svc-readarr/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-readarr/type @@ -0,0 +1 @@ +longrun diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-prowlarr-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-prowlarr-config new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-prowlarr b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-prowlarr new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/readarr/run b/root/etc/services.d/readarr/run deleted file mode 100644 index d883c71..0000000 --- a/root/etc/services.d/readarr/run +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/with-contenv bash - -exec \ - s6-setuidgid abc /app/readarr/bin/Readarr \ - -nobrowser -data=/config