From: Cédric Ollivier Date: Sun, 19 Jan 2025 14:26:06 +0000 (+0100) Subject: Fix Alpine version X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=dbcc0ba49fa3924789ca33fa395262cf69574387;p=functest-kubernetes.git Fix Alpine version Change-Id: I4aed5d5d9f0c09753c0c7d6c7ee2c83fd9a2c01f Signed-off-by: Cédric Ollivier --- diff --git a/build.sh b/build.sh index 4db163de..a0b55638 100644 --- a/build.sh +++ b/build.sh @@ -35,11 +35,11 @@ done [ ! -z "${amd64_dirs}" ] && (docker rmi \ "${repo}/functest-kubernetes-core:amd64-latest" \ - alpine:3.16 || true) + alpine:3.20 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.16|arm64v8/alpine:3.16|g" {} + + -e "s|alpine:3.20|arm64v8/alpine:3.20|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm64-latest|g" {} + @@ -59,11 +59,11 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ - arm64v8/alpine:3.16 || true) + arm64v8/alpine:3.20 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.16|arm32v7/alpine:3.16|g" {} + + -e "s|alpine:3.20|arm32v7/alpine:3.20|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm-latest|g" {} + @@ -83,7 +83,7 @@ for dir in ${arm_dirs}; do done [ ! -z "${arm_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm-latest" \ - arm32v7/alpine:3.16 || true) + arm32v7/alpine:3.20 || true) find . -name Dockerfile -exec git checkout {} + exit $?