Migrate whisparr to s6v3 (#6)

thespad · Sep 26, 2022 · b9f7778 · b9f7778
1 parent eaeb608
commit b9f7778
Show file tree

Hide file tree

Showing 17 changed files with 21 additions and 9 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,13 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:3.16
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG APP_VERSION
 LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thespad"
+LABEL org.opencontainers.image.source="https://github.com/thespad/docker-whisparr"
+LABEL org.opencontainers.image.url="https://github.com/thespad/docker-whisparr"
 
 # environment settings
 ARG APP_BRANCH="nightly"

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -1,11 +1,13 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:3.16
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG APP_VERSION
 LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thespad"
+LABEL org.opencontainers.image.source="https://github.com/thespad/docker-whisparr"
+LABEL org.opencontainers.image.url="https://github.com/thespad/docker-whisparr"
 
 # environment settings
 ARG APP_BRANCH="nightly"

diff --git a/Dockerfile.armhf b/Dockerfile.armhf
@@ -1,11 +1,13 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:3.16
 
 # set version label
 ARG BUILD_DATE
 ARG VERSION
 ARG APP_VERSION
 LABEL build_version="Version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thespad"
+LABEL org.opencontainers.image.source="https://github.com/thespad/docker-whisparr"
+LABEL org.opencontainers.image.url="https://github.com/thespad/docker-whisparr"
 
 # environment settings
 ARG APP_BRANCH="nightly"

diff --git a/README.md b/README.md
@@ -90,4 +90,5 @@ Container images are configured using parameters passed at runtime (such as thos
 
 ## Versions
 
+* **23.09.22:** - Rebase to 3.16, migrate to s6v3.
 * **01.04.22:** - Initial Release.
diff --git a/root/etc/cont-init.d/10-adduser → root/etc/s6-overlay/s6-rc.d/init-adduser/run b/root/etc/cont-init.d/10-adduser → root/etc/s6-overlay/s6-rc.d/init-adduser/run
@@ -52,4 +52,4 @@ fi
 
 chown abc:abc /app
 chown abc:abc /config
-chown abc:abc /defaults
+chown abc:abc /defaults
diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-whisparr-config b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-whisparr-config
diff --git a/root/etc/s6-overlay/s6-rc.d/init-whisparr-config/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-whisparr-config/dependencies.d/init-config
diff --git a/root/etc/cont-init.d/30-config → ...-overlay/s6-rc.d/init-whisparr-config/run b/root/etc/cont-init.d/30-config → ...-overlay/s6-rc.d/init-whisparr-config/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-whisparr-config/type b/root/etc/s6-overlay/s6-rc.d/init-whisparr-config/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-whisparr-config/up b/root/etc/s6-overlay/s6-rc.d/init-whisparr-config/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-whisparr-config/run
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-whisparr/dependencies.d/init-services b/root/etc/s6-overlay/s6-rc.d/svc-whisparr/dependencies.d/init-services
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-whisparr/notification-fd b/root/etc/s6-overlay/s6-rc.d/svc-whisparr/notification-fd
@@ -0,0 +1 @@
+3
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-whisparr/run b/root/etc/s6-overlay/s6-rc.d/svc-whisparr/run
@@ -0,0 +1,6 @@
+#!/usr/bin/with-contenv bash
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z 127.0.0.1 6969" \
+        s6-setuidgid abc /app/whisparr/bin/Whisparr \
+        -nobrowser -data=/config
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-whisparr/type b/root/etc/s6-overlay/s6-rc.d/svc-whisparr/type
@@ -0,0 +1 @@
+longrun
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-whisparr-config b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-whisparr-config
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-whisparr b/root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-whisparr
diff --git a/root/etc/services.d/whisparr/run b/root/etc/services.d/whisparr/run
Original file line number	Diff line number	Diff line change
Expand Up		@@ -90,4 +90,5 @@ Container images are configured using parameters passed at runtime (such as thos

		## Versions

		* 23.09.22: - Rebase to 3.16, migrate to s6v3.
		* 01.04.22: - Initial Release.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/etc/s6-overlay/s6-rc.d/init-whisparr-config/run