From 83e849ab232c54de49d7c066f0794d37baa78a32 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Tue, 11 Aug 2020 22:47:19 +0200 Subject: [PATCH] Fix sed if arm in build.sh MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: I2fbba9004886c72b4213e7b69bac8374af77a5ab 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 1e92b65a..50c32eac 100644 --- a/build.sh +++ b/build.sh @@ -55,12 +55,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.11-alpine3.9|arm32v7/golang:1.11-alpine3.9|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-core|\ + -e "s|opnfv/functest-kubernetes-core:hunter|\ ${repo}/functest-kubernetes-core:arm-hunter|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-healthcheck|\ + -e "s|opnfv/functest-kubernetes-healthcheck:hunter|\ ${repo}/functest-kubernetes-healthcheck:arm-hunter|g" {} + for dir in ${arm_dirs}; do (cd "${dir}" && docker build "${build_opts[@]}" \ @@ -72,7 +72,7 @@ for dir in ${arm_dirs}; do done [ ! -z "${arm_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm-hunter" \ - arm32v7/golang:1.14-alpine3.12 || true) + arm32v7/golang:1.11-alpine3.9 || true) find . -name Dockerfile -exec git checkout {} + exit $? -- 2.16.6