From 6fd86890865d5df768eaedc4146decab3ba41da9 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Fri, 14 Aug 2020 09:29:36 +0200 Subject: Update golang to 1.15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As asked by Kubernetes [1] [1] https://build.opnfv.org/ci/job/functest-kubernetes-opnfv-functest-kubernetes-healthcheck-latest-gate/60/console Change-Id: Ic57fe67f6568d19615599f7762a18170158c6771 Signed-off-by: Cédric Ollivier --- build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'build.sh') diff --git a/build.sh b/build.sh index ac5acfce..05aa529f 100644 --- a/build.sh +++ b/build.sh @@ -35,7 +35,7 @@ done find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.14-alpine3.12|arm64v8/golang:1.14-alpine3.12|g" {} + + -e "s|golang:1.15-alpine3.12|arm64v8/golang:1.15-alpine3.12|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm64-latest|g" {} + @@ -52,11 +52,11 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ - arm64v8/golang:1.14-alpine3.12 || true) + arm64v8/golang:1.15-alpine3.12 || true) 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.15-alpine3.12|arm32v7/golang:1.15-alpine3.12|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm-latest|g" {} + @@ -73,7 +73,7 @@ for dir in ${arm_dirs}; do done [ ! -z "${arm_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm-latest" \ - arm32v7/golang:1.14-alpine3.12 || true) + arm32v7/golang:1.15-alpine3.12 || true) find . -name Dockerfile -exec git checkout {} + exit $? -- cgit 1.2.3-korg