From e878f03348830466a9ca61d7eea395317a5c59c7 Mon Sep 17 00:00:00 2001
From: Tomáš Levora <t.levora@partner.samsung.com>
Date: Thu, 13 Jun 2019 13:31:01 +0200
Subject: Make loading docker images from tars optional
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As build server for building Nexus blob can be the same machine as for
previous download, there's not necessary to load all docker images if
they are already in local registry - therefore this patch makes the
loading of the images from tarballs as an option and by default will use
images directly from local registry

Issue-ID: OOM-1889

Change-Id: Id8f850afdab1009d026aef97ac1b0eb3d742f38b
Signed-off-by: Tomáš Levora <t.levora@partner.samsung.com>
---
 build/build_nexus_blob.sh | 41 +++++++++++++++++++++++++----------------
 1 file changed, 25 insertions(+), 16 deletions(-)

diff --git a/build/build_nexus_blob.sh b/build/build_nexus_blob.sh
index f3edb482..5f4ed0ff 100755
--- a/build/build_nexus_blob.sh
+++ b/build/build_nexus_blob.sh
@@ -53,31 +53,41 @@ NEXUS_EMAIL=admin@example.org
 LOCAL_PATH="$(readlink -f $(dirname ${0}))"
 
 #Defaults
+DOCKER_LOAD="false"
 DATA_DIR="$(realpath ${LOCAL_PATH}/../../resources)"
 NEXUS_DATA_DIR="${DATA_DIR}/nexus_data"
 LISTS_DIR="${LOCAL_PATH}/data_lists"
 
 usage () {
     echo "   Example usage: build_nexus_blob.sh --input-directory </path/to/downloaded/files/dir> --output-directory
-           </path/to/output/dir> --resource-list-directory </path/to/dir/with/resource/list>
+           </path/to/output/dir> --resource-list-directory </path/to/dir/with/resource/list> [--load-docker-images]
 
-     -i | --input-directory directory containing file needed to create nexus blob. The structure of this directory must organized as described in build guide
-     -o | --output-directory
-    -rl | --resource-list-directory directory with files containing docker, pypi and npm lists
+     -i  | --input-directory directory containing file needed to create nexus blob. The structure of this directory must organized as described in build guide
+     -ld | --load-docker-images load docker images from stored files in the input directory
+     -o  | --output-directory
+     -rl | --resource-list-directory directory with files containing docker, pypi and npm lists
     "
     exit 1
 }
 
-while [ "$1" != "" ]; do
-    case $1 in
+load_docker_images () {
+    for ARCHIVE in $(sed $'s/\r// ; /^#/d ; s/\:/\_/g ; s/\//\_/g ; s/$/\.tar/g' ${1} | awk '{ print $1 }'); do
+        docker load -i ${NXS_SRC_DOCKER_IMG_DIR}/${ARCHIVE}
+    done
+}
+
+while [ "${1}" != "" ]; do
+    case ${1} in
         -i | --input-directory )           shift
-                                           DATA_DIR=$1
+                                           DATA_DIR="${1}"
+                                           ;;
+        -ld | --load-docker-images )       DOCKER_LOAD="true"
                                            ;;
         -o | --output-directory )          shift
-                                           NEXUS_DATA_DIR=$1
+                                           NEXUS_DATA_DIR="${1}"
                                            ;;
         -rl | --resource-list-directory )  shift
-                                           LISTS_DIR=$1
+                                           LISTS_DIR="${1}"
                                            ;;
         -h | --help )                      usage
                                            ;;
@@ -179,13 +189,12 @@ fi
 # Docker repository preparation #
 #################################
 
-# Load predefined Nexus image
-docker load -i ${NEXUS_IMAGE_TAR}
-
-# Load all necessary images
-for ARCHIVE in $(sed $'s/\r// ; /^#/d ; s/\:/\_/g ; s/\//\_/g ; s/$/\.tar/g' ${NXS_DOCKER_IMG_LIST} | awk '{ print $1 }'); do
-   docker load -i ${NXS_SRC_DOCKER_IMG_DIR}/${ARCHIVE}
-done
+if [ "${DOCKER_LOAD}" == "true" ]; then
+    # Load predefined Nexus image
+    docker load -i ${NEXUS_IMAGE_TAR}
+    # Load all necessary images
+    load_docker_images ${NXS_DOCKER_IMG_LIST}
+fi
 
 ################################
 # Nexus repository preparation #
-- 
cgit 1.2.3-korg