From d9a3a37f85c7c33cde9badbb6b48b893425f59c7 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sun, 16 Aug 2020 11:56:12 +0200 Subject: Leverage alpine rather than golang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit golang is now useless as we stop compiling kubernetes binaries. Change-Id: I7b9416281de069d1f454b13eff6e9e6107f7471e Signed-off-by: Cédric Ollivier (cherry picked from commit 1af6a5dc4ec8e087613275e912c819ea1d0aecbc) --- build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index 50c32eac..5214fee7 100644 --- a/build.sh +++ b/build.sh @@ -30,11 +30,11 @@ done [ ! -z "${amd64_dirs}" ] && (docker rmi \ "${repo}/functest-kubernetes-core:amd64-hunter" \ - golang:1.11-alpine3.9 || true) + alpine:3.9 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.11-alpine3.9|arm64v8/golang:1.11-alpine3.9|g" {} + + -e "s|alpine:3.9|arm64v8/alpine:3.9|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core:hunter|\ ${repo}/functest-kubernetes-core:arm64-hunter|g" {} + @@ -51,11 +51,11 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-hunter" \ - arm64v8/golang:1.11-alpine3.9 || true) + arm64v8/alpine:3.9 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.11-alpine3.9|arm32v7/golang:1.11-alpine3.9|g" {} + + -e "s|alpine:3.9|arm32v7/alpine:3.9|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core:hunter|\ ${repo}/functest-kubernetes-core:arm-hunter|g" {} + @@ -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.11-alpine3.9 || true) + arm32v7/alpine:3.9 || true) find . -name Dockerfile -exec git checkout {} + exit $? -- cgit 1.2.3-korg