From: Cédric Ollivier Date: Tue, 11 Aug 2020 20:44:25 +0000 (+0200) Subject: Fix sed if arm in build.sh X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=cdc730f69cf03ebf939e4c911508afe41a0fbc29;p=functest-kubernetes.git Fix sed if arm in build.sh Change-Id: I4d3f54b1b56fbc0b272d1ee178e6ea406268c658 Signed-off-by: Cédric Ollivier --- diff --git a/build.sh b/build.sh index 1cc4fc36..c8a98d2b 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.10|arm32v7/golang:1.13-alpine3.10|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-core|\ + -e "s|opnfv/functest-kubernetes-core:jerma|\ ${repo}/functest-kubernetes-core:arm-jerma|g" {} + find . -name Dockerfile -exec sed -i \ - -e "s|opnfv/functest-kubernetes-healthcheck|\ + -e "s|opnfv/functest-kubernetes-healthcheck:jerma|\ ${repo}/functest-kubernetes-healthcheck:arm-jerma|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-jerma" \ - arm32v7/golang:1.14-alpine3.12 || true) + arm32v7/golang:1.13-alpine3.10 || true) find . -name Dockerfile -exec git checkout {} + exit $?