From 09e810749476883962632d8aa3aec5a047c797d0 Mon Sep 17 00:00:00 2001
From: Bram van Dartel <root@rootrulez.com>
Date: Sun, 14 Apr 2024 11:08:23 +0200
Subject: [PATCH] add docker secrets to s6-overlay

---
 rootfs/etc/s6-overlay/s6-rc.d/docker-entrypoint/run | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/rootfs/etc/s6-overlay/s6-rc.d/docker-entrypoint/run b/rootfs/etc/s6-overlay/s6-rc.d/docker-entrypoint/run
index ac1e2de..fda014e 100755
--- a/rootfs/etc/s6-overlay/s6-rc.d/docker-entrypoint/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/docker-entrypoint/run
@@ -334,13 +334,13 @@ function _generate_clientcert_auth_configuration() {
 
 function _docker_secrets {
     # shellcheck source=/dev/null
-    . /etc/s6-overlay/s6-rc.d/docker-entrypoint.d/.env-from-docker-secrets
+    . /etc/s6-overlay/s6-rc.d/docker-entrypoint/docker-entrypoint.d/.env-from-docker-secrets
 
-    if /usr/bin/find "/etc/s6-overlay/s6-rc.d/docker-entrypoint.d/" -mindepth 1 -maxdepth 1 -type f -print -quit 2>/dev/null | read -r v; then
-        _info "/etc/s6-overlay/s6-rc.d/docker-entrypoint.d/ is not empty, will attempt to perform configuration"
+    if /usr/bin/find "/etc/s6-overlay/s6-rc.d/docker-entrypoint/docker-entrypoint.d/" -mindepth 1 -maxdepth 1 -type f -print -quit 2>/dev/null | read -r v; then
+        _info "/etc/s6-overlay/s6-rc.d/docker-entrypoint/docker-entrypoint.d/ is not empty, will attempt to perform configuration"
 
-        _info "Looking for shell scripts in /etc/s6-overlay/s6-rc.d/docker-entrypoint.d/"
-        find "/etc/s6-overlay/s6-rc.d/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
+        _info "Looking for shell scripts in /etc/s6-overlay/s6-rc.d/docker-entrypoint/docker-entrypoint.d/"
+        find "/etc/s6-overlay/s6-rc.d/docker-entrypoint/docker-entrypoint.d/" -follow -type f -print | sort -V | while read -r f; do
             case "$f" in
             *.sh)
                 if [ -x "$f" ]; then
@@ -357,7 +357,7 @@ function _docker_secrets {
 
         _info "Docker secrets configuration complete; ready for start up..."
     else
-        _info "No Docker secrets found in /etc/s6-overlay/s6-rc.d/docker-entrypoint.d/, skipping configuration..."
+        _info "No Docker secrets found in /etc/s6-overlay/s6-rc.d/docker-entrypoint/docker-entrypoint.d/, skipping configuration..."
     fi
 
 }