diff --git a/docker/etc/cont-init.d/020-fixuser b/docker/etc/cont-init.d/020-fixuser deleted file mode 100644 index 76cf9163..00000000 --- a/docker/etc/cont-init.d/020-fixuser +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/with-contenv bash -# shellcheck shell=bash - -function __fixuser { - - groupmod -o -g "${PGID}" ab - usermod -o -u "${PUID}" ab - - chown ab:ab -R /app /ab - -} - -__fixuser 2>&1 | sed "s#^#cont-init: info: $(realpath $0): &#g" \ No newline at end of file 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 new file mode 100644 index 00000000..e69de29b diff --git a/docker/etc/s6-overlay/s6-rc.d/init-fixuser/run b/docker/etc/s6-overlay/s6-rc.d/init-fixuser/run new file mode 100644 index 00000000..be9eb81c --- /dev/null +++ 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 new file mode 100644 index 00000000..3d92b15f --- /dev/null +++ b/docker/etc/s6-overlay/s6-rc.d/init-fixuser/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/docker/etc/s6-overlay/s6-rc.d/init-fixuser/up b/docker/etc/s6-overlay/s6-rc.d/init-fixuser/up new file mode 100644 index 00000000..f1ee2c7c --- /dev/null +++ b/docker/etc/s6-overlay/s6-rc.d/init-fixuser/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-fixuser/run \ No newline at end of file diff --git a/docker/etc/cont-init.d/010-old-compatible b/docker/etc/s6-overlay/s6-rc.d/init-old-compatible/run similarity index 100% rename from docker/etc/cont-init.d/010-old-compatible rename to docker/etc/s6-overlay/s6-rc.d/init-old-compatible/run 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 new file mode 100644 index 00000000..3d92b15f --- /dev/null +++ b/docker/etc/s6-overlay/s6-rc.d/init-old-compatible/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file 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 new file mode 100644 index 00000000..593601f1 --- /dev/null +++ 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 \ No newline at end of file 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 new file mode 100644 index 00000000..e69de29b diff --git a/docker/etc/services.d/auto_bangumi/finish b/docker/etc/s6-overlay/s6-rc.d/svc-autobangumi/finish similarity index 100% rename from docker/etc/services.d/auto_bangumi/finish rename to docker/etc/s6-overlay/s6-rc.d/svc-autobangumi/finish diff --git a/docker/etc/services.d/auto_bangumi/notification-fd b/docker/etc/s6-overlay/s6-rc.d/svc-autobangumi/notification-fd similarity index 100% rename from docker/etc/services.d/auto_bangumi/notification-fd rename to docker/etc/s6-overlay/s6-rc.d/svc-autobangumi/notification-fd diff --git a/docker/etc/services.d/auto_bangumi/run b/docker/etc/s6-overlay/s6-rc.d/svc-autobangumi/run similarity index 100% rename from docker/etc/services.d/auto_bangumi/run rename to docker/etc/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 new file mode 100644 index 00000000..1780f9f4 --- /dev/null +++ b/docker/etc/s6-overlay/s6-rc.d/svc-autobangumi/type @@ -0,0 +1 @@ +longrun \ No newline at end of file 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 new file mode 100644 index 00000000..e69de29b 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 new file mode 100644 index 00000000..e69de29b 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 new file mode 100644 index 00000000..e69de29b