diff options
author | mbeierl <mark.beierl@dell.com> | 2017-09-08 15:29:55 -0400 |
---|---|---|
committer | mbeierl <mark.beierl@dell.com> | 2017-09-08 15:56:56 -0400 |
commit | d3617e26876bad963afa925620cb85fd6658d77b (patch) | |
tree | 86f2efaa226c00b3632a349844a8b2629f6a36a6 /ci/launch_docker_container.sh | |
parent | 8969493e12b6573ab0655d88540135a6e9f757b3 (diff) |
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 <mark.beierl@dell.com>
Diffstat (limited to 'ci/launch_docker_container.sh')
-rwxr-xr-x | ci/launch_docker_container.sh | 16 |
1 files changed, 11 insertions, 5 deletions
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" |