diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-11-07 22:34:03 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-11-07 22:34:03 +0100 |
| commit | bd3954bef4febc3d56568efe5fd6dabd39af791f (patch) | |
| tree | 3a2ca7f6a856cb5d85ee1590cf2727997bd6c0fa | |
| parent | bd28b49aa1ba7d8127144c2a3eef0536d9bdc606 (diff) | |
Update to Go 1.13
It's asked by Kubernetes master [1]
[1] https://build.opnfv.org/ci/job/functest-kubernetes-healthcheck-docker-build-amd64-master/90/console
Change-Id: I0fdd06944fea8ce328e16459e6cf4a9e2c6fa4f7
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | ansible/site.yml | 2 | ||||
| -rw-r--r-- | build.sh | 6 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/ansible/site.yml b/ansible/site.yml index b0baf064..6a5953f1 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -10,7 +10,7 @@ - repo: _ dport: container: golang - tag: 1.12-alpine3.10 + tag: 1.13-alpine3.10 steps: - name: build opnfv/functest-kubernetes-core containers: @@ -28,11 +28,11 @@ done [ ! -z "${amd64_dirs}" ] && (docker rmi \ "${repo}/functest-kubernetes-core:amd64-latest" \ - golang:1.12-alpine3.10 || true) + golang:1.13-alpine3.10 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:1.12-alpine3.10|arm64v8/golang:1.12-alpine3.10|g" {} + + -e "s|golang:1.13-alpine3.10|arm64v8/golang:1.13-alpine3.10|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core|\ ${repo}/functest-kubernetes-core:arm64-latest|g" {} + @@ -49,7 +49,7 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \ - arm64v8/golang:1.12-alpine3.10 || true) + arm64v8/golang:1.13-alpine3.10 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index c6907a14..5404efee 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.12-alpine3.10 +FROM golang:1.13-alpine3.10 ARG BRANCH=master ARG OPENSTACK_TAG=master |