diff options
author | Yuli Shlosberg <ys9693@att.com> | 2017-11-26 19:05:23 +0200 |
---|---|---|
committer | Michael Lando <ml636r@att.com> | 2017-11-27 08:49:27 +0000 |
commit | 0566f581c0f310384f42838c388f57234ed1d60e (patch) | |
tree | dd782da7ebd4ce591876865a564b9c1f65eb5e66 /sdc-os-chef/scripts/docker_run.sh | |
parent | 4d8033eeb036943c05b3a5752b8f4cd4d705272f (diff) |
sync 1.1.0 to master
Change-Id: I6e040f039895dd2ced55f95824473946b226fb5d
Issue-ID: SDC-707
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
Diffstat (limited to 'sdc-os-chef/scripts/docker_run.sh')
-rwxr-xr-x | sdc-os-chef/scripts/docker_run.sh | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh index ed4246d72c..79173c9654 100755 --- a/sdc-os-chef/scripts/docker_run.sh +++ b/sdc-os-chef/scripts/docker_run.sh @@ -56,19 +56,36 @@ fi RELEASE=latest LOCAL=false -SKIPTESTS=false +RUNTESTS=false DEBUG_PORT="--publish 4000:4000" while [ $# -gt 0 ] do case $1 in - -r | --release ) shift 1 ; RELEASE=$1 ; shift 1 ;; - -e | --environment ) shift 1 ; DEP_ENV=$1 ; shift 1 ;; - -p | --port ) shift 1 ; PORT=$1 ; shift 1 ;; - -l | --local ) LOCAL=true ; shift 1 ;; - -s | --skipTests ) SKIPTESTS=true ; shift 1 ;; - -h | --help ) usage ; exit 0 ;; - * ) usage ; exit 1 ;; + -r | --release ) + shift 1 ; + RELEASE=$1; + shift 1;; + -e | --environment ) + shift 1; + DEP_ENV=$1; + shift 1 ;; + -p | --port ) + shift 1 ; + PORT=$1; + shift 1 ;; + -l | --local ) + LOCAL=true; + shift 1;; + -t | --runTests ) + RUNTESTS=true; + shift 1 ;; + -h | --help ) + usage; + exit 0;; + * ) + usage; + exit 1;; esac done @@ -187,7 +204,7 @@ echo -e "" # sanityDocker echo "docker run sdc-sanity..." -if [ ${SKIPTESTS} = false ]; then +if [ ${RUNTESTS} = true ]; then echo "Triger sanity docker, please wait..." if [ ${LOCAL} = false ]; then docker pull ${PREFIX}/sdc-sanity:${RELEASE} |