From 8199f639210a116ed5b66af7e5cf1c0b706b09e9 Mon Sep 17 00:00:00 2001 From: shim_ <> Date: Thu, 26 May 2016 00:46:43 +0200 Subject: [PATCH] wait for mysql to come up --- Dockerfile | 2 +- init.sh | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 15f958e..43b6d8e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:latest RUN apk update && \ - apk add --no-cache murmur qt-mysql wget bash + apk add --no-cache murmur qt-mysql netcat-openbsd wget bash RUN wget --no-check-certificate -O /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.0.1/dumb-init_1.0.1_amd64 COPY murmur.conf /etc/murmur.conf diff --git a/init.sh b/init.sh index d275b9d..997fbd8 100755 --- a/init.sh +++ b/init.sh @@ -13,6 +13,14 @@ function write_config_if_else { fi } +function wait_for_mysql { + if [ ! -z "$DATABASE" ] && [ "$DATABASE" == "MYSQL" ]; then + PORT=3306 + if [ ! -z "$DB_PORT" ] ; then PORT="$DB_PORT" ;fi + while ! nc -z $DB_HOST $PORT; do sleep 3; done + fi +} + if [ ! -e /data/murmur.conf ]; then echo Starting Initialization cp /etc/murmur.conf /data/murmur.conf @@ -37,9 +45,11 @@ if [ ! -e /data/murmur.conf ]; then else write_config 'database' '/data/db.sqlite' fi + echo Initilization Completed + wait_for_mysql if [ ! -z "$SUPW" ] ; then /usr/bin/murmurd -fg -ini /data/murmur.conf -supw $SUPW ;fi - echo Initilization Completed + fi - +wait_for_mysql /usr/bin/murmurd -fg -ini /data/murmur.conf