diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-10-19 01:14:02 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-10-19 01:14:02 +0200 |
| commit | d4e2abd8838217ba6e52118ec9ef3bfa5bbad556 (patch) | |
| tree | 5d3d8f991accbb608eac7177ced7e9bdfa044405 | |
| parent | 99114ec00dcbf110b10546f6222d9f469f100d21 (diff) | |
Precise go version in based images
Change-Id: Idd57e68f4b6363402afa96bded1b0b9f3754cb3e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | build.sh | 6 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 2 |
2 files changed, 4 insertions, 4 deletions
@@ -28,11 +28,11 @@ for dir in ${amd64_dirs}; do done [ ! -z "${amd64_dirs}" ] && (docker rmi \ - "${repo}/functest-kubernetes-core:amd64-gambia" golang:alpine3.8 || true) + "${repo}/functest-kubernetes-core:amd64-gambia" golang:1.11.1-alpine3.8 || true) find . -name Dockerfile -exec git checkout {} + find . -name Dockerfile -exec sed -i \ - -e "s|golang:alpine3.8|arm64v8/golang:alpine3.8|g" {} + + -e "s|golang:1.11.1-alpine3.8|arm64v8/golang:1.11.1-alpine3.8|g" {} + find . -name Dockerfile -exec sed -i \ -e "s|opnfv/functest-kubernetes-core:gambia|\ ${repo}/functest-kubernetes-core:arm64-gambia|g" {} + @@ -49,7 +49,7 @@ for dir in ${arm64_dirs}; do done [ ! -z "${arm64_dirs}" ] && (docker rmi "${repo}/functest-kubernetes-core:arm64-gambia" \ - arm64v8/golang:alpine3.8 || true) + arm64v8/golang:1.11.1-alpine3.8 || true) find . -name Dockerfile -exec git checkout {} + exit $? diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 50d79c4a..1d4e0258 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:alpine3.8 +FROM golang:1.11.1-alpine3.8 ARG BRANCH=stable/gambia ARG OPENSTACK_TAG=stable/queens |