diff options
author | Petr Ospalý <p.ospaly@partner.samsung.com> | 2019-01-03 16:54:50 +0100 |
---|---|---|
committer | Petr Ospalý <p.ospaly@partner.samsung.com> | 2019-01-03 16:54:50 +0100 |
commit | 03e61247159837b566b0cfcc380606dc317fbf1a (patch) | |
tree | 731792f18e95258f5d87747c98c70c833e9eaea9 /bash/tools/creating_data/load-docker-images.sh | |
parent | 329320e637f5ab3bea558db0e13452ab9cfc7bab (diff) |
Fix whitespaces across the bash scripts
Change-Id: I8f3912f1b7f35aa889ce63592b30014d6433a82f
Issue-ID: OOM-1551
Signed-off-by: Petr Ospalý <p.ospaly@partner.samsung.com>
Diffstat (limited to 'bash/tools/creating_data/load-docker-images.sh')
-rw-r--r-- | bash/tools/creating_data/load-docker-images.sh | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/bash/tools/creating_data/load-docker-images.sh b/bash/tools/creating_data/load-docker-images.sh index e97fc6b9..685bed42 100644 --- a/bash/tools/creating_data/load-docker-images.sh +++ b/bash/tools/creating_data/load-docker-images.sh @@ -1,4 +1,5 @@ #! /usr/bin/env bash + # COPYRIGHT NOTICE STARTS HERE # # Copyright 2018 © Samsung Electronics Co., Ltd. @@ -16,6 +17,8 @@ # limitations under the License. # # COPYRIGHT NOTICE ENDS HERE + + # boilerplate RELATIVE_PATH=../ # relative path from this script to 'common-functions.sh' if [ "$IS_COMMON_FUNCTIONS_SOURCED" != YES ] ; then @@ -23,21 +26,26 @@ if [ "$IS_COMMON_FUNCTIONS_SOURCED" != YES ] ; then LOCAL_PATH=$(readlink -f "$SCRIPT_DIR") . "${LOCAL_PATH}"/"${RELATIVE_PATH}"/common-functions.sh fi + CLEAN=false + if [ -z "$NEXUS_HOST" ]; then echo "Independent run for inserting of additional docker images" CLEAN=true mv ~/.docker/config.json ~/.docker/config.json_backup 2>/dev/null source "$LOCAL_PATH/docker-login.sh" fi + IMG_DIR="$1" if [[ -z "$IMG_DIR" ]]; then IMG_DIR="$(pwd)/images" fi + if [[ ! -d "${IMG_DIR}" ]]; then echo "No ${IMG_DIR} to load images" exit 0 fi + load_image() { local image="$1" echo "[DEBUG] load ${image}" @@ -49,14 +57,17 @@ load_image() { # delete pushed image from docker retry docker rmi "$name" } + IMAGES=$(find ${IMG_DIR} -name "*.tar" -type f) lines=$(echo ${IMAGES} | wc -l) line=1 for image in ${IMAGES}; do echo "== pkg #$line of $lines ==" load_image "$image" + line=$((line+1)) done + if [ "$CLEAN" = true ]; then # onap is using different credentials for docker login which can be conflicted # with ours so better to clean this-up |