From d3617e26876bad963afa925620cb85fd6658d77b Mon Sep 17 00:00:00 2001 From: mbeierl Date: Fri, 8 Sep 2017 15:29:55 -0400 Subject: Changing Daily to Docker Pull Changes the daily job to pull images from Docker.io instead of using docker-compose build to build the image from local sources. Reduces the default run time to ~30 minutes unless overridden in the job definition. Change-Id: Ib153b66454363f91813dc9c946f6b46156c502bd JIRA: STORPERF-204 Signed-off-by: mbeierl --- ci/launch_docker_container.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'ci/launch_docker_container.sh') diff --git a/ci/launch_docker_container.sh b/ci/launch_docker_container.sh index 949bf9d..2411ce0 100755 --- a/ci/launch_docker_container.sh +++ b/ci/launch_docker_container.sh @@ -11,7 +11,7 @@ cd `dirname $0` ci=`pwd` -cd ${ci}/../docker +cd ${ci}/../docker-compose export ENV_FILE=${ci}/job/admin.rc export CARBON_DIR=${ci}/job/carbon/ @@ -19,18 +19,24 @@ export CARBON_DIR=${ci}/job/carbon/ if [ ! -d ${ci}/job/carbon ] then mkdir ${ci}/job/carbon - sudo chown 33:33 ${ci}/job/carbon fi -if [ -z $ARCH ] +if [ -z ${ARCH} ] then ARCH=x86_64 fi export ARCH -docker-compose -f local-docker-compose.yaml build -docker-compose -f local-docker-compose.yaml up -d +if [ -z ${DOCKER_TAG} ] +then + DOCKER_TAG=latest +fi + +export TAG=${DOCKER_TAG} + +docker-compose pull +docker-compose up -d echo "Waiting for StorPerf to become active" -- cgit 1.2.3-korg