flywithu/kopano-docker
1
0
Fork 0
mirror of https://github.com/zokradonh/kopano-docker synced 2025-10-30 18:07:46 +00:00
Code Issues Releases Wiki Activity

Add dynamic dependency-wait for server and spooler service. (#119)

Browse Source 
* Add dynamic dependency-wait for server and spooler service.
Instead of using hard-coded dependency-waits on startup for database and MTA for the server and spooler, respectively, the actually configured values are now used.

For the servers, this also takes the use of a unix file socket over a network socket into account.
This commit is contained in:
mithomas 2019-03-23 00:10:22 +01:00 committed by Felix Bartels
parent 71f88b8451
commit 29839286ad
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/start-service.sh
View File

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
ADDITIONAL_KOPANO_PACKAGES=${ADDITIONAL_KOPANO_PACKAGES:-""} ADDITIONAL_KOPANO_PACKAGES=${ADDITIONAL_KOPANO_PACKAGES:-""}
KCCONF_SERVER_MYSQL_SOCKET=${KCCONF_SERVER_MYSQL_SOCKET:-""}
set -eu # unset variables are errors & non-zero return values exit the whole script set -eu # unset variables are errors & non-zero return values exit the whole script
@ -38,12 +39,18 @@ fi
# start regular service # start regular service
case "$SERVICE_TO_START" in case "$SERVICE_TO_START" in
server) server)
# determine db connection mode (unix vs. network socket)
if [ -n "$KCCONF_SERVER_MYSQL_SOCKET" ]; then
DB_CONN="file://$KCCONF_SERVER_MYSQL_SOCKET"
else
DB_CONN="tcp://$KCCONF_SERVER_MYSQL_HOST:$KCCONF_SERVER_MYSQL_PORT"
fi
/kopano/services/kopano-public-store.sh & /kopano/services/kopano-public-store.sh &
/kopano/services/kopano-users.sh & /kopano/services/kopano-users.sh &
dockerize \ dockerize \
-wait file://"$KCCONF_SERVER_SERVER_SSL_CA_FILE" \ -wait file://"$KCCONF_SERVER_SERVER_SSL_CA_FILE" \
-wait file://"$KCCONF_SERVER_SERVER_SSL_KEY_FILE" \ -wait file://"$KCCONF_SERVER_SERVER_SSL_KEY_FILE" \
-wait tcp://db:3306 \ -wait "$DB_CONN" \
-timeout 360s -timeout 360s
# cleaning up env variables # cleaning up env variables
unset "${!KCCONF_@}" unset "${!KCCONF_@}"
@ -115,7 +122,7 @@ search)
spooler) spooler)
dockerize \ dockerize \
-wait file://var/run/kopano/server.sock \ -wait file://var/run/kopano/server.sock \
-wait tcp://mail:25 \ -wait tcp://"$KCCONF_SPOOLER_SMTP_SERVER":25 \
-timeout 1080s -timeout 1080s
# cleaning up env variables # cleaning up env variables
unset "${!KCCONF_@}" unset "${!KCCONF_@}"