From 9efa75fa08dad32b95ada37bb8e22371c51626c3 Mon Sep 17 00:00:00 2001 From: mbeierl Date: Wed, 12 Jul 2017 21:41:01 -0400 Subject: Creation of Local Docker for Daily Job Moves the dockerfiles for the different submodules/containers into their respective directories. Adds a docker compose file that can build the containers from the local filesystem, and mounts the local filesystem as a volume, making it easier for developer testing as local changes are automatically reflected in the final container. Change-Id: I2376034258cab2a3dc3a0d1ac3f01bbf5d1f59e7 JIRA: STORPERF-189 Signed-off-by: mbeierl --- ci/launch_docker_container.sh | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'ci/launch_docker_container.sh') diff --git a/ci/launch_docker_container.sh b/ci/launch_docker_container.sh index 4f4e38b..b2cf1c4 100755 --- a/ci/launch_docker_container.sh +++ b/ci/launch_docker_container.sh @@ -11,9 +11,8 @@ cd `dirname $0` ci=`pwd` -cd ${ci}/../docker-compose +cd ${ci}/../docker -export TAG=${DOCKER_TAG:-latest} export ENV_FILE=${ci}/job/admin.rc export CARBON_DIR=${ci}/job/carbon/ @@ -23,15 +22,11 @@ then sudo chown 33:33 ${ci}/job/carbon fi -docker-compose pull -docker-compose up -d +docker-compose -f local-docker-compose.yaml up -d echo "Waiting for StorPerf to become active" -curl -X GET 'http://127.0.0.1:5000/api/v1.0/configurations' > test.html 2>&1 -while [ `grep 'agent_count' test.html | wc -l` == "0" ] + +while [ $(curl -s -o /dev/null -I -w "%{http_code}" -X GET http://127.0.0.1:5000/api/v1.0/configurations) != "200" ] do sleep 1 - curl -X GET 'http://127.0.0.1:5000/api/v1.0/configurations' > test.html 2>&1 done - -rm -f test.html -- cgit 1.2.3-korg