mirror of
https://github.com/nextcloud/all-in-one.git
synced 2025-12-19 22:16:49 +00:00
Added env variable to nextcloud container, changed reachability in favor of apache container host.
Signed-off-by: JMarcosHP <jehuherrerap@hotmail.com>
This commit is contained in:
parent
79d4ce1436
commit
3c2a1edcc4
3 changed files with 8 additions and 20 deletions
|
|
@ -1,24 +1,10 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# ENV Variables
|
# Wait until the apache container is ready
|
||||||
MAX_RETRY=3
|
while ! nc -z "$APACHE_HOST" "$APACHE_PORT"; do
|
||||||
COUNT=1
|
echo "Waiting for Apache to become available..."
|
||||||
|
|
||||||
# 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
|
sleep 15
|
||||||
((COUNT++))
|
|
||||||
fi
|
|
||||||
done
|
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
|
if [ -n "$NEXTCLOUD_EXEC_COMMANDS" ]; then
|
||||||
echo "#!/bin/bash" > /tmp/nextcloud-exec-commands
|
echo "#!/bin/bash" > /tmp/nextcloud-exec-commands
|
||||||
|
|
|
||||||
|
|
@ -136,6 +136,8 @@ services:
|
||||||
- POSTGRES_USER=nextcloud
|
- POSTGRES_USER=nextcloud
|
||||||
- REDIS_HOST=nextcloud-aio-redis
|
- REDIS_HOST=nextcloud-aio-redis
|
||||||
- REDIS_HOST_PASSWORD=${REDIS_PASSWORD}
|
- REDIS_HOST_PASSWORD=${REDIS_PASSWORD}
|
||||||
|
- APACHE_HOST=nextcloud-aio-apache
|
||||||
|
- APACHE_PORT
|
||||||
- NC_DOMAIN
|
- NC_DOMAIN
|
||||||
- ADMIN_USER=admin
|
- ADMIN_USER=admin
|
||||||
- ADMIN_PASSWORD=${NEXTCLOUD_PASSWORD}
|
- ADMIN_PASSWORD=${NEXTCLOUD_PASSWORD}
|
||||||
|
|
@ -174,7 +176,6 @@ services:
|
||||||
- TALK_RECORDING_HOST=nextcloud-aio-talk-recording
|
- TALK_RECORDING_HOST=nextcloud-aio-talk-recording
|
||||||
- FULLTEXTSEARCH_PASSWORD
|
- FULLTEXTSEARCH_PASSWORD
|
||||||
- REMOVE_DISABLED_APPS
|
- REMOVE_DISABLED_APPS
|
||||||
- APACHE_PORT
|
|
||||||
- IMAGINARY_SECRET
|
- IMAGINARY_SECRET
|
||||||
- WHITEBOARD_SECRET
|
- WHITEBOARD_SECRET
|
||||||
- WHITEBOARD_ENABLED
|
- WHITEBOARD_ENABLED
|
||||||
|
|
|
||||||
|
|
@ -210,6 +210,8 @@
|
||||||
"POSTGRES_USER=nextcloud",
|
"POSTGRES_USER=nextcloud",
|
||||||
"REDIS_HOST=nextcloud-aio-redis",
|
"REDIS_HOST=nextcloud-aio-redis",
|
||||||
"REDIS_HOST_PASSWORD=%REDIS_PASSWORD%",
|
"REDIS_HOST_PASSWORD=%REDIS_PASSWORD%",
|
||||||
|
"APACHE_HOST=nextcloud-aio-apache",
|
||||||
|
"APACHE_PORT=%APACHE_PORT%",
|
||||||
"AIO_TOKEN=%AIO_TOKEN%",
|
"AIO_TOKEN=%AIO_TOKEN%",
|
||||||
"NC_DOMAIN=%NC_DOMAIN%",
|
"NC_DOMAIN=%NC_DOMAIN%",
|
||||||
"ADMIN_USER=admin",
|
"ADMIN_USER=admin",
|
||||||
|
|
@ -251,7 +253,6 @@
|
||||||
"FULLTEXTSEARCH_PASSWORD=%FULLTEXTSEARCH_PASSWORD%",
|
"FULLTEXTSEARCH_PASSWORD=%FULLTEXTSEARCH_PASSWORD%",
|
||||||
"DOCKER_SOCKET_PROXY_ENABLED=%DOCKER_SOCKET_PROXY_ENABLED%",
|
"DOCKER_SOCKET_PROXY_ENABLED=%DOCKER_SOCKET_PROXY_ENABLED%",
|
||||||
"REMOVE_DISABLED_APPS=%REMOVE_DISABLED_APPS%",
|
"REMOVE_DISABLED_APPS=%REMOVE_DISABLED_APPS%",
|
||||||
"APACHE_PORT=%APACHE_PORT%",
|
|
||||||
"ADDITIONAL_TRUSTED_PROXY=%CADDY_IP_ADDRESS%",
|
"ADDITIONAL_TRUSTED_PROXY=%CADDY_IP_ADDRESS%",
|
||||||
"THIS_IS_AIO=true",
|
"THIS_IS_AIO=true",
|
||||||
"IMAGINARY_SECRET=%IMAGINARY_SECRET%",
|
"IMAGINARY_SECRET=%IMAGINARY_SECRET%",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue