paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #874 from mkuron/sogo-mysql 

Properly wait for MySQL to come up before starting SOGo
master
André Peters 2018-01-08 20:24:32 +01:00 committed by GitHub
parent 24c8c82f5a cde250a989
commit 0d70de4385
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
data/Dockerfiles/sogo/bootstrap-sogo.sh
View File

@ -1,7 +1,10 @@
#!/bin/bash #!/bin/bash
# Wait for MySQL to warm-up # Wait for MySQL to warm-up
while mysqladmin ping --host mysql -u${DBUSER} -p${DBPASS}${DBPASS} --silent; do while ! mysqladmin ping --host mysql -u${DBUSER} -p${DBPASS} --silent; do
echo "Waiting for database to come up..."
sleep 2
done
# Wait until port becomes free and send sig # Wait until port becomes free and send sig
until ! nc -z sogo-mailcow 20000; until ! nc -z sogo-mailcow 20000;
@ -101,5 +104,3 @@ chown sogo:sogo -R /var/lib/sogo/
chmod 600 /var/lib/sogo/GNUstep/Defaults/sogod.plist chmod 600 /var/lib/sogo/GNUstep/Defaults/sogod.plist
exec gosu sogo /usr/sbin/sogod exec gosu sogo /usr/sbin/sogod
done

2
docker-compose.yml
View File

@ -124,7 +124,7 @@ services:
- phpfpm - phpfpm
sogo-mailcow: sogo-mailcow:
image: mailcow/sogo:1.12 image: mailcow/sogo:1.13
build: ./data/Dockerfiles/sogo build: ./data/Dockerfiles/sogo
environment: environment:
- DBNAME=${DBNAME} - DBNAME=${DBNAME}