summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-10-19 01:14:02 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-10-19 01:16:00 +0200
commit487b80eeacc3d62540861a3cf345822c58902c80 (patch)
tree0812fa85cab0d57da979410f31cf8613761c6de4
parent07dc65bb64c34db0d657e7f57ffc033927869923 (diff)
Precise go version in based images
Change-Id: Idd57e68f4b6363402afa96bded1b0b9f3754cb3e Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--build.sh6
-rw-r--r--docker/core/Dockerfile2
2 files changed, 4 insertions, 4 deletions
diff --git a/build.sh b/build.sh
index 18356fed..90cd0a14 100644
--- a/build.sh
+++ b/build.sh
@@ -28,11 +28,11 @@ for dir in ${amd64_dirs}; do
done
[ ! -z "${amd64_dirs}" ] &&
(docker rmi \
- "${repo}/functest-kubernetes-core:amd64-hunter" golang:alpine3.8 || true)
+ "${repo}/functest-kubernetes-core:amd64-hunter" 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:hunter|\
${repo}/functest-kubernetes-core:arm64-hunter|g" {} +
@@ -49,7 +49,7 @@ for dir in ${arm64_dirs}; do
done
[ ! -z "${arm64_dirs}" ] &&
(docker rmi "${repo}/functest-kubernetes-core:arm64-hunter" \
- 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 e6b2b0c6..f33a1273 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/hunter
ARG OPENSTACK_TAG=stable/rocky