From 3b2d3fcc7c09a26b537e69ba9b6bd8ef5b7045cf Mon Sep 17 00:00:00 2001 From: Jim Van Fleet Date: Mon, 5 Sep 2016 10:06:11 -0400 Subject: [PATCH] Parameterizing WAIT_TIME to facilitate debugging --- Dockerfile | 2 ++ container_files/bin/start.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 35e30438..cca47c28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,6 +14,8 @@ LABEL Version=$version ENV VERSION=$version ENV TOMCAT_VERSION="6.0.35" +ENV WAIT_TIME=60 + LABEL Build docker build --rm --tag $maintainer/$imagename . COPY MariaDB.repo /etc/yum.repos.d/MariaDB.repo diff --git a/container_files/bin/start.sh b/container_files/bin/start.sh index 13aa9cde..d354de68 100755 --- a/container_files/bin/start.sh +++ b/container_files/bin/start.sh @@ -17,7 +17,7 @@ then fi else echo "Composed so waiting for MariaDB: " > $log - /opt/wait-for-it/wait-for-it.sh $MYSQL_HOST:3306 -t 60 --strict -- /opt/bin/main.sh + /opt/wait-for-it/wait-for-it.sh $MYSQL_HOST:3306 -t $WAIT_TIME --strict -- /opt/bin/main.sh laststatus="$?" echo "Composed status: $laststatus" if [ "$laststatus" != "0" ]; then