Merge pull request #353 from DDS-Derek/s6-config-v3

feat: upgrade docker S6 config to v3
EstrellaXD · Jul 3, 2023 · 6acf69a · 6acf69a
2 parents 403c426 + d7ecc82
commit 6acf69a
Show file tree

Hide file tree

Showing 17 changed files with 20 additions and 27 deletions.
diff --git a/docker/etc/cont-init.d/010-old-compatible b/docker/etc/cont-init.d/010-old-compatible
diff --git a/docker/etc/cont-init.d/020-fixuser b/docker/etc/cont-init.d/020-fixuser
diff --git a/docker/etc/s6-overlay/s6-rc.d/init-fixuser/dependencies.d/init-old-compatible b/docker/etc/s6-overlay/s6-rc.d/init-fixuser/dependencies.d/init-old-compatible
diff --git a/docker/etc/s6-overlay/s6-rc.d/init-fixuser/run b/docker/etc/s6-overlay/s6-rc.d/init-fixuser/run
@@ -0,0 +1,7 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+groupmod -o -g "${PGID}" ab
+usermod -o -u "${PUID}" ab
+
+chown ab:ab -R /app /ab
diff --git a/docker/etc/s6-overlay/s6-rc.d/init-fixuser/type b/docker/etc/s6-overlay/s6-rc.d/init-fixuser/type
@@ -0,0 +1 @@
+oneshot
diff --git a/docker/etc/s6-overlay/s6-rc.d/init-fixuser/up b/docker/etc/s6-overlay/s6-rc.d/init-fixuser/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-fixuser/run
diff --git a/docker/etc/s6-overlay/s6-rc.d/init-old-compatible/run b/docker/etc/s6-overlay/s6-rc.d/init-old-compatible/run
@@ -0,0 +1,8 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+umask ${UMASK}
+
+if [ -f /config/bangumi.json ]; then
+    mv /config/bangumi.json /app/data/bangumi.json
+fi
diff --git a/docker/etc/s6-overlay/s6-rc.d/init-old-compatible/type b/docker/etc/s6-overlay/s6-rc.d/init-old-compatible/type
@@ -0,0 +1 @@
+oneshot
diff --git a/docker/etc/s6-overlay/s6-rc.d/init-old-compatible/up b/docker/etc/s6-overlay/s6-rc.d/init-old-compatible/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-old-compatible/run
diff --git a/docker/etc/s6-overlay/s6-rc.d/svc-autobangumi/dependencies.d/init-fixuser b/docker/etc/s6-overlay/s6-rc.d/svc-autobangumi/dependencies.d/init-fixuser
diff --git a/docker/etc/services.d/auto_bangumi/finish → ...s6-overlay/s6-rc.d/svc-autobangumi/finish b/docker/etc/services.d/auto_bangumi/finish → ...s6-overlay/s6-rc.d/svc-autobangumi/finish
diff --git a/...c/services.d/auto_bangumi/notification-fd → ...y/s6-rc.d/svc-autobangumi/notification-fd b/...c/services.d/auto_bangumi/notification-fd → ...y/s6-rc.d/svc-autobangumi/notification-fd
diff --git a/docker/etc/services.d/auto_bangumi/run → ...tc/s6-overlay/s6-rc.d/svc-autobangumi/run b/docker/etc/services.d/auto_bangumi/run → ...tc/s6-overlay/s6-rc.d/svc-autobangumi/run
diff --git a/docker/etc/s6-overlay/s6-rc.d/svc-autobangumi/type b/docker/etc/s6-overlay/s6-rc.d/svc-autobangumi/type
@@ -0,0 +1 @@
+longrun
diff --git a/docker/etc/s6-overlay/s6-rc.d/user/contents.d/init-fixuser b/docker/etc/s6-overlay/s6-rc.d/user/contents.d/init-fixuser
diff --git a/docker/etc/s6-overlay/s6-rc.d/user/contents.d/init-old-compatible b/docker/etc/s6-overlay/s6-rc.d/user/contents.d/init-old-compatible
diff --git a/docker/etc/s6-overlay/s6-rc.d/user/contents.d/svc-autobangumi b/docker/etc/s6-overlay/s6-rc.d/user/contents.d/svc-autobangumi