From b506989b2d4eb7e16ddce6e917719385cdaa5599 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 25 Apr 2022 10:41:53 +0200 Subject: Fix Alpine version in build.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia9959d58c3b2ae636197232211e47d3b9d7c6260 Signed-off-by: Cédric Ollivier --- build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index effd07500..1f412e449 100644 --- a/build.sh +++ b/build.sh @@ -31,11 +31,11 @@ for dir in ${amd64_dirs}; do (docker rmi "${repo}/functest-${dir##**/}:amd64-latest" || true) done [ -n "${amd64_dirs}" ] && - (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.13 || true) + (docker rmi "${repo}/functest-core:amd64-latest" alpine:3.14 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.13|arm64v8/alpine:3.13|g" {} + + -e "s|alpine:3.14|arm64v8/alpine:3.14|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core|${repo}/functest-core:arm64-latest|g" {} + find . -name Dockerfile -exec sed -i \ @@ -52,11 +52,11 @@ for dir in ${arm64_dirs}; do done [ -n "${arm64_dirs}" ] && (docker rmi "${repo}/functest-core:arm64-latest" \ - arm64v8/alpine:3.13 || true) + arm64v8/alpine:3.14 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.13|arm32v6/alpine:3.13|g" {} + + -e "s|alpine:3.14|arm32v6/alpine:3.14|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core|${repo}/functest-core:arm-latest|g" {} + find . -name Dockerfile -exec sed -i \ @@ -73,7 +73,7 @@ for dir in ${arm_dirs}; do done [ -n "${arm_dirs}" ] && (docker rmi "${repo}/functest-core:arm-latest" \ - arm32v6/alpine:3.13 || true) + arm32v6/alpine:3.14 || true) find . -name Dockerfile -exec git checkout {} + exit $? -- cgit 1.2.3-korg