From bb889a464d0fa047043e3acdec42af01f2d47b7f Mon Sep 17 00:00:00 2001
From: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
Date: Mon, 13 Aug 2018 13:18:38 -0500
Subject: [PATCH] obs: build-from-docker.sh: Not build image if already
 craeted.

Accelerate the build process by not creating image again.

Add DEBUG flag to docker run.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
---
 obs-packaging/build_from_docker.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/obs-packaging/build_from_docker.sh b/obs-packaging/build_from_docker.sh
index 7cc8aeba14..96cf8b7754 100755
--- a/obs-packaging/build_from_docker.sh
+++ b/obs-packaging/build_from_docker.sh
@@ -38,6 +38,7 @@ docker_run(){
 		--env https_proxy="${https_proxy}" \
 		--env no_proxy="${no_proxy}" \
 		--env PUSH="${PUSH}" \
+		--env DEBUG="${DEBUG}" \
 		-v "${HOME}/.bashrc":/root/.bashrc \
 		-v "$cache_dir":/var/tmp/osbuild-packagecache/ \
 		-v "$packaging_repo_dir":${packaging_repo_dir} \
@@ -61,7 +62,10 @@ main(){
 	[ -n "${branch}" ] || usage "missing branch" "1"
 	pushd "${script_dir}/kata-containers-image/" >> /dev/null
 	echo "Building image"
-	./build_image.sh
+	image_tarball=$(find . -name 'kata-containers-'"${branch}"'-*.tar.gz')
+	[ -f "${image_tarball}" ] || "${script_dir}/../obs-packaging/kata-containers-image/build_image.sh" -v "${branch}"
+	image_tarball=$(find . -name 'kata-containers-'"${branch}"'-*.tar.gz')
+	[ -f "${image_tarball}" ] || die "image not found"
 	popd >> /dev/null
 	sudo docker build \
 		--build-arg http_proxy="${http_proxy}" \
@@ -69,7 +73,7 @@ main(){
 		-t $obs_image "${script_dir}"
 
 	#Create/update OBS repository for branch
-	docker_run "${packaging_repo_dir}/obs-packaging/create-pkg-branch.sh ${branch}"
+	#docker_run "${packaging_repo_dir}/obs-packaging/create-pkg-branch.sh ${branch}"
 	#Build all kata packages
 	docker_run "${packaging_repo_dir}/obs-packaging/build_all.sh ${branch}"
 }