From 5535cd9bab2ab64a9d3cc3d08eb72e25e3b00b22 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 11 Aug 2020 22:41:27 +0200 Subject: Fix sed if arm in build.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I797295abc7f1a33c96484fed2fd85d23c6fc1aeb 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 3cf78e2d..525bf33a 100644 --- a/build.sh +++ b/build.sh @@ -56,12 +56,12 @@ done find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.14-alpine3.12|arm32v7/golang:1.14-alpine3.12|g" {} + + -e "s|golang:1.13-alpine3.11|arm32v7/golang:1.13-alpine3.11|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-core|\ + -e "s|opnfv/functest-kubernetes-core:kali|\ ${repo}/functest-kubernetes-core:arm-kali|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-healthcheck|\ + -e "s|opnfv/functest-kubernetes-healthcheck:kali|\ ${repo}/functest-kubernetes-healthcheck:arm-kali|g" {} + for dir in ${arm_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ @@ -73,7 +73,7 @@ for dir in ${arm_dirs}; do done [ ! -z "${arm_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm-kali" \ - arm32v7/golang:1.14-alpine3.12 || true) + arm32v7/golang:1.13-alpine3.11 || true) find . -name Dockerfile -exec git checkout {} + exit $? -- cgit 1.2.3-korg