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

Merge pull request #7288 from nextcloud/enh/noid/apache-port-available
Some checks are pending
Codespell / Check spelling (push) Waiting to run
Details
Docker Lint / docker-lint (push) Waiting to run
Details
Helm Chart Releaser / release (push) Waiting to run
Details
Lint php / php-lint (push) Waiting to run
Details
Lint php / php-lint-summary (push) Blocked by required conditions
Details
PHP Deprecation Detector / PHP Deprecation Detector (push) Waiting to run
Details
Static analysis / static-psalm-analysis (push) Waiting to run
Details
Shellcheck / Check Shell (push) Waiting to run
Details

Browse source 
daily-bakup.sh: fix issue with apache-port
This commit is contained in:
Simon L. 2025-12-10 15:28:40 +01:00 • committed by GitHub
commit b097be27ad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Containers/mastercontainer/daily-backup.sh
View file

@ -23,8 +23,8 @@ fi
sudo -E -u www-data touch "/mnt/docker-aio-config/data/daily_backup_running"
# Check if apache is running/stopped, watchtower is stopped and backupcontainer is stopped
APACHE_PORT="$(docker inspect nextcloud-aio-apache --format "{{.Config.Env}}" | grep -o 'APACHE_PORT=[0-9]\+' | grep -o '[0-9]\+' | head -1)"
if [ -z "$APACHE_PORT" ]; then
LOCAL_APACHE_PORT="$(docker inspect nextcloud-aio-apache --format "{{.Config.Env}}" | grep -o 'APACHE_PORT=[0-9]\+' | grep -o '[0-9]\+' | head -1)"
if [ -z "$LOCAL_APACHE_PORT" ]; then
echo "APACHE_PORT is not set which is not expected..."
else
# Connect mastercontainer to nextcloud-aio network to make sure that nextcloud-aio-apache is reachable
@ -32,7 +32,7 @@ else
docker network connect nextcloud-aio nextcloud-aio-mastercontainer &>/dev/null
# Wait for apache to start
while docker ps --format "{{.Names}}" | grep -q "^nextcloud-aio-apache$" && ! nc -z nextcloud-aio-apache "$APACHE_PORT"; do
while docker ps --format "{{.Names}}" | grep -q "^nextcloud-aio-apache$" && ! nc -z nextcloud-aio-apache "$LOCAL_APACHE_PORT"; do
echo "Waiting for apache to become available"
sleep 30
done