From 93a25d4b5e45b87e05cc680e34cb00942cb9bbe9 Mon Sep 17 00:00:00 2001 From: Gard Rimestad Date: Mon, 15 Dec 2014 07:16:48 +0100 Subject: [PATCH] DOCKER_HOST support added #64 --- scripts/docker-postgres.sh | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/scripts/docker-postgres.sh b/scripts/docker-postgres.sh index e3c73eb612..d7d7c190af 100755 --- a/scripts/docker-postgres.sh +++ b/scripts/docker-postgres.sh @@ -1,11 +1,28 @@ #!/bin/bash export POSTGRES_PASSWORD="uleash" -export TEST_DATABASE_URL=postgres://postgres:unleash@127.0.0.1:15432/postgres -HASH=`docker run -p 127.0.0.1:15432:5432 --name unleash-postgres -e POSTGRES_PASSWORD=$POSTGRES_PASSWORD -d postgres:9.3` +echo "starting postgres in docker " + +HASH=`docker run -p 0.0.0.0:15432:5432 --name unleash-postgres -e POSTGRES_PASSWORD=$POSTGRES_PASSWORD -d postgres:9.3` + +# ----------- Wait for postgres to start ----------- +for i in `seq 1 120`; +do + echo -n "." + sleep 1 + netcat -z experimental-docker.finntech.no 15432 && echo "postgres is up and running in docker in $i seconds!" && break +done + +if [ -z "$DOCKER_HOST" ] + then + export database_host="127.0.0.1" +else + export database_host=$(echo $DOCKER_HOST |awk -F \/ '{print $NF}'| awk -F \: '{print $1}') +fi +export TEST_DATABASE_URL=postgres://postgres:unleash@$database_host:15432/postgres + npm install DATABASE_URL=$TEST_DATABASE_URL ./node_modules/.bin/db-migrate up npm test docker stop $HASH docker rm $HASH -