s6 v3

hotio · Aug 27, 2023 · ce959c3 · ce959c3
1 parent 48d5fdc
commit ce959c3
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 2 deletions.
diff --git a/linux-amd64.Dockerfile b/linux-amd64.Dockerfile
@@ -20,4 +20,3 @@ RUN curl -fsSL "https://github.com/Tautulli/Tautulli/archive/v${VERSION}.tar.gz"
     echo "${GIT_BRANCH}" > "${APP_DIR}/branch.txt"
 
 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 curl -fsSL "https://github.com/Tautulli/Tautulli/archive/v${VERSION}.tar.gz"
     echo "${GIT_BRANCH}" > "${APP_DIR}/branch.txt"
 
 COPY root/ /
-RUN chmod -R +x /etc/cont-init.d/ /etc/services.d/
diff --git a/root/etc/s6-overlay/s6-rc.d/init-perms/dependencies.d/base b/root/etc/s6-overlay/s6-rc.d/init-perms/dependencies.d/base
diff --git a/root/etc/s6-overlay/s6-rc.d/init-perms/type b/root/etc/s6-overlay/s6-rc.d/init-perms/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-perms/up b/root/etc/s6-overlay/s6-rc.d/init-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/init-secrets/dependencies.d/init-perms b/root/etc/s6-overlay/s6-rc.d/init-secrets/dependencies.d/init-perms
diff --git a/root/etc/s6-overlay/s6-rc.d/init-secrets/run b/root/etc/s6-overlay/s6-rc.d/init-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/init-secrets/type b/root/etc/s6-overlay/s6-rc.d/init-secrets/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-secrets/up b/root/etc/s6-overlay/s6-rc.d/init-secrets/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-secrets/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup/dependencies.d/init-secrets b/root/etc/s6-overlay/s6-rc.d/init-setup/dependencies.d/init-secrets
diff --git a/root/etc/cont-init.d/00-start-container → root/etc/s6-overlay/s6-rc.d/init-setup/run b/root/etc/cont-init.d/00-start-container → root/etc/s6-overlay/s6-rc.d/init-setup/run
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup/type b/root/etc/s6-overlay/s6-rc.d/init-setup/type
@@ -0,0 +1 @@
+oneshot
diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup/up b/root/etc/s6-overlay/s6-rc.d/init-setup/up
@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-setup/run
diff --git a/root/etc/s6-overlay/s6-rc.d/service-tautulli/dependencies.d/init-setup b/root/etc/s6-overlay/s6-rc.d/service-tautulli/dependencies.d/init-setup
diff --git a/root/etc/services.d/tautulli/run → ...c/s6-overlay/s6-rc.d/service-tautulli/run b/root/etc/services.d/tautulli/run → ...c/s6-overlay/s6-rc.d/service-tautulli/run
diff --git a/root/etc/s6-overlay/s6-rc.d/service-tautulli/type b/root/etc/s6-overlay/s6-rc.d/service-tautulli/type
@@ -0,0 +1 @@
+longrun
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-perms b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-perms
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-secrets b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-secrets
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-setup
diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/service-tautulli b/root/etc/s6-overlay/s6-rc.d/user/contents.d/service-tautulli