From ce409b3c2925c1f56ab1311a584240914b911821 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 13 Mar 2023 14:39:06 +0100 Subject: Revert to Alpine 3.16 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ruby-bundler 2.3.26-r0 as proposed in Alpine 3.17 seems buggy https://github.com/googleapis/google-cloud-ruby/issues/19266 Change-Id: Ifcb6ba3e92d2ee5f21db859f6ee143a998dd6237 Signed-off-by: Cédric Ollivier --- build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index ac24a1191..0fcf95bb1 100644 --- a/build.sh +++ b/build.sh @@ -31,11 +31,11 @@ for dir in ${amd64_dirs}; do (docker rmi "${repo}/functest-${dir##**/}:amd64-yoga" || true) done [ -n "${amd64_dirs}" ] && - (docker rmi "${repo}/functest-core:amd64-yoga" alpine:3.17 || true) + (docker rmi "${repo}/functest-core:amd64-yoga" alpine:3.16 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.17|arm64v8/alpine:3.17|g" {} + + -e "s|alpine:3.16|arm64v8/alpine:3.16|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core:yoga|${repo}/functest-core:arm64-yoga|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-yoga" \ - arm64v8/alpine:3.17 || true) + arm64v8/alpine:3.16 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|alpine:3.17|arm32v6/alpine:3.17|g" {} + + -e "s|alpine:3.16|arm32v6/alpine:3.16|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-core:yoga|${repo}/functest-core:arm-yoga|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-yoga" \ - arm32v6/alpine:3.17 || true) + arm32v6/alpine:3.16 || true) find . -name Dockerfile -exec git checkout {} + exit $? -- cgit 1.2.3-korg