From 6773927116384e0e6a03a9460a378f2760efa3b7 Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Sat, 20 Oct 2018 09:07:21 +0200 Subject: [PATCH] reolace until loop with dockerize as well Signed-off-by: Felix Bartels --- core/start-service.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/core/start-service.sh b/core/start-service.sh index e2d0622..17ccff9 100755 --- a/core/start-service.sh +++ b/core/start-service.sh @@ -30,12 +30,12 @@ fi # start regular service case "$SERVICE_TO_START" in server) - # TODO the until loop needs to be extended for the other services and certificates - until [[ -f $KCCONF_SERVER_SERVER_SSL_KEY_FILE && -f $KCCONF_SERVER_SERVER_SSL_CA_FILE ]]; do - echo "waiting for $KCCONF_SERVER_SERVER_SSL_KEY_FILE & $KCCONF_SERVER_SERVER_SSL_CA_FILE"| ts - sleep 5 - done - dockerize -wait tcp://db:3306 + # TODO needs to be extended for the other services and certificates + dockerize \ + -wait file://$KCCONF_SERVER_SERVER_SSL_CA_FILE \ + -wait file://$KCCONF_SERVER_SERVER_SSL_KEY_FILE \ + -wait tcp://db:3306 \ + -timeout 360s exec /usr/sbin/kopano-server -F ;; dagent)