Precise go version in parent container

Change-Id: I49133d0770c3c8a75c9a44172a771fadb6a19554
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/ansible/site.yml b/ansible/site.yml
index 50b375c..f6cd8a6 100644 (file)
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -13,7 +13,7 @@
           - repo: _
             dport:
             container: golang
-            tag: alpine3.8
+            tag: 1.11-alpine3.8
         steps:
           - name: build opnfv/functest-kubernetes-core
             containers:

diff --git a/build.sh b/build.sh
index 8a8bdf3..58f44d6 100644 (file)
--- 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-gambia" golang:1.11.1-alpine3.8 || true)
+        "${repo}/functest-kubernetes-core:amd64-gambia" golang:1.11-alpine3.8 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|golang:1.11.1-alpine3.8|arm64v8/golang:alpine3.8|g" {} +
+    -e "s|golang:1.11-alpine3.8|arm64v8/golang:1.11-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-alpine3.8 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 50d79c4..18e045e 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:alpine3.8
+FROM golang:1.11-alpine3.8
 
 ARG BRANCH=stable/gambia
 ARG OPENSTACK_TAG=stable/queens