diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-07-07 10:29:21 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-07-07 10:29:21 +0200 |
| commit | 6fa912328906d3073b6afe7acc2b39b2a895e538 (patch) | |
| tree | 3d2cc6db504fe9e8a0a689bfc1f58b9f362d13a7 | |
| parent | 62b861884f55815e00b24f3aca6acb95e0f804b9 (diff) | |
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 <cedric.ollivier@orange.com>
| -rw-r--r-- | ansible/site.yml | 2 | ||||
| -rw-r--r-- | build.sh | 4 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 |
3 files changed, 4 insertions, 4 deletions
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: @@ -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 |