From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 23 Dec 2017 11:41:10 +0000 (+0100)
Subject: Add Docker build opts
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=8d28a8282aaf9aa738e7d43c2bf65ec0d4f20b6a;p=functest.git

Add Docker build opts

Change-Id: I91fcb833b6b6216338b4fcb888f093a2086264a7
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 9545e4cd5f16805adf2caadf348432ca1e8d9cd7)
---

diff --git a/build.sh b/build.sh
index f3fa12aad..c509a7335 100644
--- a/build.sh
+++ b/build.sh
@@ -14,24 +14,19 @@ docker/parser \
 docker/restapi"}
 arm64_dirs=${arm64_dirs-$(echo "${amd64_dirs}" | sed -e "s|docker/vnf||" \
     -e "s|docker/restapi||")}
+build_opts=(--pull=true --no-cache --force-rm=true)
 
 find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core:euphrates|${repo}/functest-core:amd64-euphrates|g" {} +
-if [[ ${amd64_dirs} != *"docker/core"* ]]; then
-    docker pull "${repo}/functest-core:amd64-euphrates"
-fi
 for dir in ${amd64_dirs}; do
-    (cd "${dir}" && docker build --no-cache -t "${repo}/functest-${dir##**/}:amd64-euphrates" .)
+    (cd "${dir}" && docker build "${build_opts[@]}" -t "${repo}/functest-${dir##**/}:amd64-euphrates" .)
     docker push "${repo}/functest-${dir##**/}:amd64-euphrates"
 done
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i -e "s|alpine:3.6|multiarch/alpine:arm64-v3.6|g" {} +
 find . -name Dockerfile -exec sed -i -e "s|opnfv/functest-core:euphrates|${repo}/functest-core:arm64-euphrates|g" {} +
-if [[ ${arm64_dirs} != *"docker/core"* ]]; then
-    docker pull "${repo}/functest-core:arm64-euphrates"
-fi
 for dir in ${arm64_dirs}; do
-    (cd "${dir}" && docker build --no-cache -t "${repo}/functest-${dir##**/}:arm64-euphrates" .)
+    (cd "${dir}" && docker build "${build_opts[@]}" -t "${repo}/functest-${dir##**/}:arm64-euphrates" .)
     docker push "${repo}/functest-${dir##**/}:arm64-euphrates"
 done
 find . -name Dockerfile -exec git checkout {} +