From f76f87fd002f6b069628e71239d00362ac8b4d62 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Sun, 11 Sep 2022 21:32:42 +0100 Subject: [PATCH 1/2] Migrate to s6v3 --- Dockerfile | 11 ++++++----- Dockerfile.aarch64 | 11 ++++++----- Dockerfile.armhf | 11 ++++++----- readme-vars.yml | 1 + .../s6-rc.d/init-config-end/dependencies.d/init-ombi | 0 .../s6-rc.d/init-ombi/dependencies.d/init-config | 0 .../30-config => s6-overlay/s6-rc.d/init-ombi/run} | 2 +- root/etc/s6-overlay/s6-rc.d/init-ombi/type | 1 + root/etc/s6-overlay/s6-rc.d/init-ombi/up | 1 + .../s6-rc.d/svc-ombi/dependencies.d/init-ombi | 0 .../s6-rc.d/svc-ombi/dependencies.d/init-services | 0 root/etc/s6-overlay/s6-rc.d/svc-ombi/notification-fd | 1 + root/etc/s6-overlay/s6-rc.d/svc-ombi/run | 8 ++++++++ root/etc/s6-overlay/s6-rc.d/svc-ombi/type | 1 + root/etc/s6-overlay/s6-rc.d/user/contents.d/init-ombi | 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-ombi | 0 root/etc/services.d/ombi/run | 10 ---------- 17 files changed, 32 insertions(+), 26 deletions(-) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-ombi create mode 100644 root/etc/s6-overlay/s6-rc.d/init-ombi/dependencies.d/init-config rename root/etc/{cont-init.d/30-config => s6-overlay/s6-rc.d/init-ombi/run} (82%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-ombi/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-ombi/up create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-ombi/dependencies.d/init-ombi create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-ombi/dependencies.d/init-services create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-ombi/notification-fd create mode 100755 root/etc/s6-overlay/s6-rc.d/svc-ombi/run create mode 100644 root/etc/s6-overlay/s6-rc.d/svc-ombi/type create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-ombi create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-ombi delete mode 100755 root/etc/services.d/ombi/run diff --git a/Dockerfile b/Dockerfile index 7dfba81..08a4dd3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy-cd65f39a-ls39 +FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy # set version label ARG BUILD_DATE @@ -14,10 +14,11 @@ ENV DEBIAN_FRONTEND="noninteractive" RUN \ apt-get update && \ apt-get install -y \ - libicu70 && \ + libicu70 \ + netcat && \ echo "**** install ombi ****" && \ mkdir -p \ - /opt/ombi && \ + /app/ombi && \ if [ -z ${OMBI_RELEASE+x} ]; then \ OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-app/Ombi/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ @@ -26,8 +27,8 @@ RUN \ /tmp/ombi-src.tar.gz -L \ "https://github.com/Ombi-app/Ombi/releases/download/${OMBI_RELEASE}/linux-x64.tar.gz" && \ tar xzf /tmp/ombi-src.tar.gz -C \ - /opt/ombi/ && \ - chmod +x /opt/ombi/Ombi && \ + /app/ombi/ && \ + chmod +x /app/ombi/Ombi && \ echo "**** clean up ****" && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index b5f5506..ef057c2 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy-cd65f39a-ls39 +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy # set version label ARG BUILD_DATE @@ -14,10 +14,11 @@ ENV DEBIAN_FRONTEND="noninteractive" RUN \ apt-get update && \ apt-get install -y \ - libicu70 && \ + libicu70 \ + netcat && \ echo "**** install ombi ****" && \ mkdir -p \ - /opt/ombi && \ + /app/ombi && \ if [ -z ${OMBI_RELEASE+x} ]; then \ OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-app/Ombi/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ @@ -26,8 +27,8 @@ RUN \ /tmp/ombi-src.tar.gz -L \ "https://github.com/Ombi-app/Ombi/releases/download/${OMBI_RELEASE}/linux-arm64.tar.gz" && \ tar xzf /tmp/ombi-src.tar.gz -C \ - /opt/ombi/ && \ - chmod +x /opt/ombi/Ombi && \ + /app/ombi/ && \ + chmod +x /app/ombi/Ombi && \ echo "**** clean up ****" && \ rm -rf \ /tmp/* \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 3854d36..fa007a5 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy-cd65f39a-ls39 +FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy # set version label ARG BUILD_DATE @@ -14,10 +14,11 @@ ENV DEBIAN_FRONTEND="noninteractive" RUN \ apt-get update && \ apt-get install -y \ - libicu70 && \ + libicu70 \ + netcat && \ echo "**** install ombi ****" && \ mkdir -p \ - /opt/ombi && \ + /app/ombi && \ if [ -z ${OMBI_RELEASE+x} ]; then \ OMBI_RELEASE=$(curl -sX GET "https://api.github.com/repos/Ombi-app/Ombi/releases/latest" \ | awk '/tag_name/{print $4;exit}' FS='[""]'); \ @@ -26,8 +27,8 @@ RUN \ /tmp/ombi-src.tar.gz -L \ "https://github.com/Ombi-app/Ombi/releases/download/${OMBI_RELEASE}/linux-arm.tar.gz" && \ tar xzf /tmp/ombi-src.tar.gz -C \ - /opt/ombi/ && \ - chmod +x /opt/ombi/Ombi && \ + /app/ombi/ && \ + chmod +x /app/ombi/Ombi && \ echo "**** clean up ****" && \ rm -rf \ /tmp/* \ diff --git a/readme-vars.yml b/readme-vars.yml index 4eafde5..a1a55ef 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -55,6 +55,7 @@ app_setup_block: | # changelog changelogs: + - { date: "11.09.22:", desc: "Migrate to s6v3." } - { date: "01.05.22:", desc: "Rebase to Jammy." } - { date: "26.04.21:", desc: "Update tarball name, allow for v4 builds in stable." } - { date: "18.01.21:", desc: "Update upstream repo. Deprecate `v4-preview` tag, which is merged to `development` tag upstream." } diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-ombi b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-ombi new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/init-ombi/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-ombi/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-ombi/run old mode 100644 new mode 100755 similarity index 82% rename from root/etc/cont-init.d/30-config rename to root/etc/s6-overlay/s6-rc.d/init-ombi/run index 04ea0e2..1d1a590 --- a/root/etc/cont-init.d/30-config +++ b/root/etc/s6-overlay/s6-rc.d/init-ombi/run @@ -2,5 +2,5 @@ # permissions chown -R abc:abc \ - /opt/ombi \ + /app/ombi \ /config diff --git a/root/etc/s6-overlay/s6-rc.d/init-ombi/type b/root/etc/s6-overlay/s6-rc.d/init-ombi/type new file mode 100644 index 0000000..bdd22a1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-ombi/type @@ -0,0 +1 @@ +oneshot diff --git a/root/etc/s6-overlay/s6-rc.d/init-ombi/up b/root/etc/s6-overlay/s6-rc.d/init-ombi/up new file mode 100644 index 0000000..00cdcb1 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-ombi/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-ombi/run diff --git a/root/etc/s6-overlay/s6-rc.d/svc-ombi/dependencies.d/init-ombi b/root/etc/s6-overlay/s6-rc.d/svc-ombi/dependencies.d/init-ombi new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-ombi/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-ombi/dependencies.d/init-services new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-ombi/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-ombi/notification-fd new file mode 100644 index 0000000..00750ed --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-ombi/notification-fd @@ -0,0 +1 @@ +3 diff --git a/root/etc/s6-overlay/s6-rc.d/svc-ombi/run b/root/etc/s6-overlay/s6-rc.d/svc-ombi/run new file mode 100755 index 0000000..440d8dd --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-ombi/run @@ -0,0 +1,8 @@ +#!/usr/bin/with-contenv bash + +if [[ -n "${BASE_URL}" ]]; then + EXTRA_PARAM="--baseurl ${BASE_URL}" +fi + +s6-notifyoncheck -d -n 12 -c "nc -z 127.0.0.1 3579" \ + cd /app/ombi s6-setuidgid abc /app/ombi/Ombi --storage "/config" --host http://*:3579 ${EXTRA_PARAM} diff --git a/root/etc/s6-overlay/s6-rc.d/svc-ombi/type b/root/etc/s6-overlay/s6-rc.d/svc-ombi/type new file mode 100644 index 0000000..5883cff --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/svc-ombi/type @@ -0,0 +1 @@ +longrun diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-ombi b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-ombi new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-ombi b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-ombi new file mode 100644 index 0000000..e69de29 diff --git a/root/etc/services.d/ombi/run b/root/etc/services.d/ombi/run deleted file mode 100755 index a16843d..0000000 --- a/root/etc/services.d/ombi/run +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/with-contenv bash - -cd /opt/ombi || exit - -if [[ -n "${BASE_URL}" ]]; then - EXTRA_PARAM="--baseurl ${BASE_URL}" -fi - -exec \ - s6-setuidgid abc /opt/ombi/Ombi --storage "/config" --host http://*:3579 ${EXTRA_PARAM} From 9c7ef6f0b51711a06d5193126fa9bf4698906910 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Mon, 12 Sep 2022 09:52:16 +0100 Subject: [PATCH 2/2] Increase service notification timeout --- root/etc/s6-overlay/s6-rc.d/svc-ombi/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/svc-ombi/run b/root/etc/s6-overlay/s6-rc.d/svc-ombi/run index 440d8dd..9cbb4c8 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-ombi/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-ombi/run @@ -4,5 +4,5 @@ if [[ -n "${BASE_URL}" ]]; then EXTRA_PARAM="--baseurl ${BASE_URL}" fi -s6-notifyoncheck -d -n 12 -c "nc -z 127.0.0.1 3579" \ +s6-notifyoncheck -d -n 60 -w 5000 -c "nc -z 127.0.0.1 3579" \ cd /app/ombi s6-setuidgid abc /app/ombi/Ombi --storage "/config" --host http://*:3579 ${EXTRA_PARAM}