diff options
| author |   Mark Beierl <mark.beierl@dell.com> | 2017-09-11 13:04:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-09-11 13:04:49 +0000 |
| commit | b8f6ce5a13fb9ae4c1da3fb22f2c404ad9118a0f (patch) | |
| tree | ac0bc5bf07bc0e0c76edcffb4e3174ca80841d1f /ci/launch_docker_container.sh | |
| parent | 3e2a7529b80a15b07e945aec4db026124b003b3c (diff) | |
| parent | d3617e26876bad963afa925620cb85fd6658d77b (diff) | |
Merge "Changing Daily to Docker Pull"
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" |