From 3c2a1edcc4f491539fffd969d726f9a6b0d5ec2a Mon Sep 17 00:00:00 2001
From: JMarcosHP <jehuherrerap@hotmail.com>
Date: Tue, 17 Dec 2024 10:39:01 -0600
Subject: [PATCH] Added  env variable to nextcloud container, changed 
 reachability in favor of apache container host.

Signed-off-by: JMarcosHP <jehuherrerap@hotmail.com>
---
 Containers/nextcloud/run-exec-commands.sh | 22 ++++------------------
 manual-install/latest.yml                 |  3 ++-
 php/containers.json                       |  3 ++-
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/Containers/nextcloud/run-exec-commands.sh b/Containers/nextcloud/run-exec-commands.sh
index d98527f9..e917a96d 100644
--- a/Containers/nextcloud/run-exec-commands.sh
+++ b/Containers/nextcloud/run-exec-commands.sh
@@ -1,24 +1,10 @@
 #!/bin/bash
 
-# ENV Variables
-MAX_RETRY=3
-COUNT=1
-
-# Wait until the domain is reachable
-sleep 15
-while [ "$COUNT" -le "$MAX_RETRY" ]; do
-    if nc -z "$NC_DOMAIN" 443; then
-        echo "Domain reached."
-        break
-    else
-        echo "Attempt $COUNT: Domain not reachable. Retrying in 15 seconds..."
-        sleep 15
-        ((COUNT++))
-    fi
+# Wait until the apache container is ready
+while ! nc -z "$APACHE_HOST" "$APACHE_PORT"; do
+    echo "Waiting for Apache to become available..."
+    sleep 15
 done
-if [ "$COUNT" -gt "$MAX_RETRY" ]; then
-    echo "The domain could not be reached after $MAX_RETRY attempts. Proceeding anyway..."
-fi
 
 if [ -n "$NEXTCLOUD_EXEC_COMMANDS" ]; then
     echo "#!/bin/bash" > /tmp/nextcloud-exec-commands
diff --git a/manual-install/latest.yml b/manual-install/latest.yml
index 15af7f53..049c5d11 100644
--- a/manual-install/latest.yml
+++ b/manual-install/latest.yml
@@ -136,6 +136,8 @@ services:
       - POSTGRES_USER=nextcloud
       - REDIS_HOST=nextcloud-aio-redis
       - REDIS_HOST_PASSWORD=${REDIS_PASSWORD}
+      - APACHE_HOST=nextcloud-aio-apache
+      - APACHE_PORT
       - NC_DOMAIN
       - ADMIN_USER=admin
       - ADMIN_PASSWORD=${NEXTCLOUD_PASSWORD}
@@ -174,7 +176,6 @@ services:
       - TALK_RECORDING_HOST=nextcloud-aio-talk-recording
       - FULLTEXTSEARCH_PASSWORD
       - REMOVE_DISABLED_APPS
-      - APACHE_PORT
       - IMAGINARY_SECRET
       - WHITEBOARD_SECRET
       - WHITEBOARD_ENABLED
diff --git a/php/containers.json b/php/containers.json
index a6553039..1b0192b6 100644
--- a/php/containers.json
+++ b/php/containers.json
@@ -210,6 +210,8 @@
         "POSTGRES_USER=nextcloud",
         "REDIS_HOST=nextcloud-aio-redis",
         "REDIS_HOST_PASSWORD=%REDIS_PASSWORD%",
+        "APACHE_HOST=nextcloud-aio-apache",
+        "APACHE_PORT=%APACHE_PORT%",
         "AIO_TOKEN=%AIO_TOKEN%",
         "NC_DOMAIN=%NC_DOMAIN%",
         "ADMIN_USER=admin",
@@ -251,7 +253,6 @@
         "FULLTEXTSEARCH_PASSWORD=%FULLTEXTSEARCH_PASSWORD%",
         "DOCKER_SOCKET_PROXY_ENABLED=%DOCKER_SOCKET_PROXY_ENABLED%",
         "REMOVE_DISABLED_APPS=%REMOVE_DISABLED_APPS%",
-        "APACHE_PORT=%APACHE_PORT%",
         "ADDITIONAL_TRUSTED_PROXY=%CADDY_IP_ADDRESS%",
         "THIS_IS_AIO=true",
         "IMAGINARY_SECRET=%IMAGINARY_SECRET%",