eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-19 22:16:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #5730 from JMarcosHP/main

Browse source 
Add apache container reachability check and retry mechanism to run-exec-commands.sh
This commit is contained in:
Simon L. 2024-12-20 11:17:03 +01:00 • committed by GitHub
commit 4379446e16
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Containers/nextcloud/run-exec-commands.sh
View file

@ -1,7 +1,10 @@
#!/bin/bash #!/bin/bash
# Wait 15s for domain to be reachable # Wait until the apache container is ready
while ! nc -z "$APACHE_HOST" "$APACHE_PORT"; do
echo "Waiting for Apache to become available..."
sleep 15 sleep 15
done
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

3
manual-install/latest.yml
View file

@ -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

3
php/containers.json
View file

@ -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%",