From 25f68f484d550a9e54fd0b5d19524c024ac420ba Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 17 Aug 2018 17:54:19 +0200 Subject: Take docker tag into account MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It completes the previous patch [1] [1] https://gerrit.opnfv.org/gerrit/#/c/61035/ Change-Id: Icd8244dad40f66d9bd549dbc3ceac7e426c06b9c Signed-off-by: Cédric Ollivier --- build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 48661351..2d369a4b 100644 --- a/build.sh +++ b/build.sh @@ -12,10 +12,10 @@ arm64_dirs=${arm64_dirs-${amd64_dirs}} build_opts=(--pull=true --no-cache --force-rm=true) find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-core|\ + -e "s|opnfv/functest-kubernetes-core:fraser|\ ${repo}/functest-kubernetes-core:amd64-fraser|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-healthcheck|\ + -e "s|opnfv/functest-kubernetes-healthcheck:fraser|\ ${repo}/functest-kubernetes-healthcheck:amd64-fraser|g" {} + for dir in ${amd64_dirs}; do (cd "${dir}" && @@ -34,10 +34,10 @@ find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ -e "s|alpine:3.7|multiarch/alpine:arm64-v3.7|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-core|\ + -e "s|opnfv/functest-kubernetes-core:fraser|\ ${repo}/functest-kubernetes-core:arm64-fraser|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-healthcheck|\ + -e "s|opnfv/functest-kubernetes-healthcheck:fraser|\ ${repo}/functest-kubernetes-healthcheck:arm64-fraser|g" {} + for dir in ${arm64_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ -- cgit 1.2.3-korg