From 8d28a8282aaf9aa738e7d43c2bf65ec0d4f20b6a Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 23 Dec 2017 12:41:10 +0100 Subject: Add Docker build opts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I91fcb833b6b6216338b4fcb888f093a2086264a7 Signed-off-by: Cédric Ollivier (cherry picked from commit 9545e4cd5f16805adf2caadf348432ca1e8d9cd7) --- build.sh | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) 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 {} + -- cgit 1.2.3-korg