From 93e089323a148fc5c4c4ed4ca37b91c3700aa8e7 Mon Sep 17 00:00:00 2001
From: xZero707 <aleksandar@puharic.com>
Date: Mon, 10 Mar 2025 23:03:29 +0100
Subject: [PATCH] Adapt to the changes in docker-env-secrets module

---
 .../s6-rc.d/init-install-wordpress/run        |  4 +---
 .../s6-rc.d/init-wpconfig-verify/run          |  2 --
 rootfs/usr/local/bin/load_secrets             | 21 -------------------
 3 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100755 rootfs/usr/local/bin/load_secrets

diff --git a/rootfs/etc/s6-overlay/s6-rc.d/init-install-wordpress/run b/rootfs/etc/s6-overlay/s6-rc.d/init-install-wordpress/run
index fb8dab8..4963e1b 100755
--- a/rootfs/etc/s6-overlay/s6-rc.d/init-install-wordpress/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/init-install-wordpress/run
@@ -44,9 +44,7 @@ main() {
         return 1
     fi
 
-    source /usr/local/bin/load_secrets
-
-    s6-envdir /run/secrets_normalized wp core install \
+    wp core install \
         --url="${WORDPRESS_INIT_SITE_URL:?}" \
         --title="${WORDPRESS_INIT_SITE_TITLE:-WordPress}" \
         --admin_user="${WORDPRESS_INIT_ADMIN_USER:?}" \
diff --git a/rootfs/etc/s6-overlay/s6-rc.d/init-wpconfig-verify/run b/rootfs/etc/s6-overlay/s6-rc.d/init-wpconfig-verify/run
index af5ee40..22f3e24 100755
--- a/rootfs/etc/s6-overlay/s6-rc.d/init-wpconfig-verify/run
+++ b/rootfs/etc/s6-overlay/s6-rc.d/init-wpconfig-verify/run
@@ -70,8 +70,6 @@ main() {
     # This will prepend service name to all output from here
     exec > >(while read -r line; do echo "[init-wpconfig-verify] ${line}"; done) 2>&1
 
-    source /usr/local/bin/load_secrets
-
     echo "Checking salts..."
     if ! checkSaltsEnv; then
         echo "^^^ Some or all of the salts are not set. Cannot continue."
diff --git a/rootfs/usr/local/bin/load_secrets b/rootfs/usr/local/bin/load_secrets
deleted file mode 100755
index c9c266e..0000000
--- a/rootfs/usr/local/bin/load_secrets
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-load_dir_env() {
-    local dir="$1"
-
-    shopt -s nullglob
-
-    for file in "$dir"/*; do
-        if [ -f "$file" ] && [[ "$(basename "$file")" != *=* ]]; then
-            varName="$(basename "$file")"
-            value="$(<"$file")"
-            export "${varName}=${value}"
-        fi
-    done
-}
-
-main() {
-    load_dir_env /run/secrets_normalized
-}
-
-main