s6 v3

hotio · Aug 27, 2023 · f031f98 · f031f98
1 parent a6af811
commit f031f98
Show file tree

Hide file tree

Showing 17 changed files with 26 additions and 2 deletions.
diff --git a/linux-amd64.Dockerfile b/linux-amd64.Dockerfile
@@ -20,4 +20,3 @@ RUN mkdir "${APP_DIR}/bin" && \
     chmod -R u=rwX,go=rX "${APP_DIR}"
 
 COPY root/ /
-RUN chmod -R +x /etc/cont-init.d/ /etc/services.d/
diff --git a/linux-arm64.Dockerfile b/linux-arm64.Dockerfile
@@ -20,4 +20,3 @@ RUN mkdir "${APP_DIR}/bin" && \
     chmod -R u=rwX,go=rX "${APP_DIR}"
 
 COPY root/ /
-RUN chmod -R +x /etc/cont-init.d/ /etc/services.d/
diff --git a/root/etc/s6-overlay/s6-rc.d/perms/dependencies.d/base b/root/etc/s6-overlay/s6-rc.d/perms/dependencies.d/base
diff --git a/root/etc/s6-overlay/s6-rc.d/perms/type b/root/etc/s6-overlay/s6-rc.d/perms/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/perms/up b/root/etc/s6-overlay/s6-rc.d/perms/up
@@ -0,0 +1 @@
+find /etc/s6-overlay/s6-rc.d -name "run" -execdir chmod +x {} +
diff --git a/root/etc/s6-overlay/s6-rc.d/secrets/dependencies.d/perms b/root/etc/s6-overlay/s6-rc.d/secrets/dependencies.d/perms
diff --git a/root/etc/s6-overlay/s6-rc.d/secrets/run b/root/etc/s6-overlay/s6-rc.d/secrets/run
@@ -0,0 +1,19 @@
+#!/command/with-contenv bash
+# shellcheck shell=bash
+
+find /var/run/s6/container_environment/ -type f -name 'FILE__*' -print0 | while IFS= read -r -d '' FILENAME; do
+    NEW_VAR=${FILENAME//FILE__/}
+    SECRET_FILE=$(cat "${FILENAME}")
+    if [[ ! -f ${SECRET_FILE} ]]; then
+        echo "[${NEW_VAR##*/}] The file \"${SECRET_FILE}\" wasn't found!"
+        exit 1
+    fi
+    SECRET=$(cat "${SECRET_FILE}")
+    if [[ -n ${SECRET} ]]; then
+        echo -n "${SECRET}" > "${NEW_VAR}"
+        echo "[${NEW_VAR##*/}] Set with secret from \"${SECRET_FILE}\"."
+    else
+        echo "[${NEW_VAR##*/}] No secret found in \"${SECRET_FILE}\"!"
+        exit 1
+    fi
+done
diff --git a/root/etc/s6-overlay/s6-rc.d/secrets/type b/root/etc/s6-overlay/s6-rc.d/secrets/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/secrets/up b/root/etc/s6-overlay/s6-rc.d/secrets/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/secrets/run
diff --git a/root/etc/s6-overlay/s6-rc.d/service1/dependencies.d/setup b/root/etc/s6-overlay/s6-rc.d/service1/dependencies.d/setup
diff --git a/root/etc/services.d/lidarr/run → root/etc/s6-overlay/s6-rc.d/service1/run b/root/etc/services.d/lidarr/run → root/etc/s6-overlay/s6-rc.d/service1/run
diff --git a/root/etc/s6-overlay/s6-rc.d/service1/type b/root/etc/s6-overlay/s6-rc.d/service1/type
@@ -0,0 +1 @@
+longrun
diff --git a/root/etc/s6-overlay/s6-rc.d/setup/dependencies.d/secrets b/root/etc/s6-overlay/s6-rc.d/setup/dependencies.d/secrets
diff --git a/root/etc/cont-init.d/00-start-container → root/etc/s6-overlay/s6-rc.d/setup/run b/root/etc/cont-init.d/00-start-container → root/etc/s6-overlay/s6-rc.d/setup/run
diff --git a/root/etc/s6-overlay/s6-rc.d/setup/type b/root/etc/s6-overlay/s6-rc.d/setup/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/setup/up b/root/etc/s6-overlay/s6-rc.d/setup/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/setup/run
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/service1 b/root/etc/s6-overlay/s6-rc.d/user/contents.d/service1