From f842b36613c91f86dd371b590e048e5c4e510f34 Mon Sep 17 00:00:00 2001
From: eronkeo <ronan.keogh@est.tech>
Date: Wed, 20 Mar 2019 15:00:20 +0000
Subject: [PATCH] update for missing nginx tarfile

This update adds an entry to the docker_images lists file to ensure
it is saved as a tar file and available for processing in the
"Prepare infra related images to infra folder" section.

Change-Id: I293144daa96b3c579443a2e76a407ea04821dce7
Issue-ID: OOM-1738
Signed-off-by: eronkeo <ronan.keogh@est.tech>
---
 build/creating_data/create_nginx_image/01create-image.sh | 6 ++++++
 build/download_offline_data_by_lists.sh                  | 4 +---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/build/creating_data/create_nginx_image/01create-image.sh b/build/creating_data/create_nginx_image/01create-image.sh
index 86d96cf2..aa62e40a 100755
--- a/build/creating_data/create_nginx_image/01create-image.sh
+++ b/build/creating_data/create_nginx_image/01create-image.sh
@@ -18,7 +18,13 @@
 #
 #   COPYRIGHT NOTICE ENDS HERE
 
+IMG_DIR="${1}"
+
+if [[ ! -e $IMG_DIR ]]; then
+    mkdir -p "${IMG_DIR}"
+fi
 
 script_dir="$(dirname ${BASH_SOURCE[0]})"
 cd "$script_dir"
 docker build -t own_nginx .
+docker -l error save -o "$IMG_DIR/own_nginx_latest.tar" "own_nginx:latest"
diff --git a/build/download_offline_data_by_lists.sh b/build/download_offline_data_by_lists.sh
index 741c2046..8f671844 100755
--- a/build/download_offline_data_by_lists.sh
+++ b/build/download_offline_data_by_lists.sh
@@ -59,14 +59,12 @@ echo "[Step $((CURR++))/$TOTAL Download docker images for infra-server]"
 $CTOOLS/download-docker-images.sh "${LISTS_DIR}/infra_docker_images.list"
 
 echo "[Step $((CURR++))/$TOTAL Build own nginx image]"
-$CTOOLS/create_nginx_image/01create-image.sh
+$CTOOLS/create_nginx_image/01create-image.sh "${DATA_DIR}/offline_data/docker_images_infra"
 
 echo "[Step $((CURR++))/$TOTAL Save docker images from docker cache to tarfiles]"
 $CTOOLS/save-docker-images.sh "${LISTS_DIR}/${TAG}-docker_images.list" "${DATA_DIR}/offline_data/docker_images_for_nexus"
 
 echo "[Step $((CURR++))/$TOTAL Prepare infra related images to infra folder]"
-mkdir -p "${DATA_DIR}/offline_data/docker_images_infra"
-mv "${DATA_DIR}/offline_data/docker_images_for_nexus/own_nginx_latest.tar" "${DATA_DIR}/offline_data/docker_images_infra"
 $CTOOLS/save-docker-images.sh "${LISTS_DIR}/infra_docker_images.list" "${DATA_DIR}/offline_data/docker_images_infra"
 
 echo "[Step $((CURR++))/$TOTAL Download git repos]"
-- 
2.16.6