diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-14 09:29:36 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2020-08-14 09:30:29 +0200 |
| commit | 6fd86890865d5df768eaedc4146decab3ba41da9 (patch) | |
| tree | 3a548bb60833a0a10acca1d26a9eed4cc4bc8ae4 | |
| parent | 9cd357b94e7bdb7b8cce73a2666a7547e2a5d7c8 (diff) | |
Update golang to 1.15
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 <cedric.ollivier@orange.com>
| -rw-r--r-- | build.sh | 8 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 |
2 files changed, 5 insertions, 5 deletions
@@ -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 $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index b1135338..250d4685 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.14-alpine3.12 +FROM golang:1.15-alpine3.12 ARG BRANCH=master ARG OPENSTACK_TAG=master |