From: Cédric Ollivier Date: Tue, 7 Jul 2020 08:29:21 +0000 (+0200) Subject: Update to go 1.14 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F02%2F70502%2F1;p=functest-kubernetes.git Update to go 1.14 https://build.opnfv.org/ci/job/functest-kubernetes-healthcheck-docker-build-amd64-master/116/console Change-Id: I8559ee71fe05682792728a62baa628c8199dfdd6 Signed-off-by: Cédric Ollivier --- diff --git a/ansible/site.yml b/ansible/site.yml index f9e2c74a..96d44f97 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -10,7 +10,7 @@ - repo: _ dport: container: golang - tag: 1.13-alpine3.12 + tag: 1.14-alpine3.12 steps: - name: build opnfv/functest-kubernetes-core containers: diff --git a/build.sh b/build.sh index f69549db..c5f8eeb5 100644 --- a/build.sh +++ b/build.sh @@ -34,7 +34,7 @@ done find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.13-alpine3.12|arm64v8/golang:1.13-alpine3.12|g" {} + + -e "s|golang:1.14-alpine3.12|arm64v8/golang:1.14-alpine3.12|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm64-latest|g" {} + @@ -51,7 +51,7 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ - arm64v8/golang:1.13-alpine3.12 || true) + arm64v8/golang:1.14-alpine3.12 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 123f866d..1ae24dde 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.13-alpine3.12 +FROM golang:1.14-alpine3.12 ARG BRANCH=master ARG OPENSTACK_TAG=master