From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 29 Mar 2019 07:51:08 +0000 (+0100)
Subject: Only set go major version in parent container
X-Git-Tag: opnfv-8.1.0~1
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F41%2F67441%2F1;p=functest-kubernetes.git

Only set go major version in parent container

It allows updating automatically the minor versions.

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

diff --git a/ansible/site.yml b/ansible/site.yml
index 852bc46d..8bc52ac2 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -13,7 +13,7 @@
           - repo: _
             dport:
             container: golang
-            tag: 1.11.6-alpine3.9
+            tag: 1.11-alpine3.9
         steps:
           - name: build opnfv/functest-kubernetes-core
             containers:
diff --git a/build.sh b/build.sh
index a186f496..6870beb9 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:1.11.6-alpine3.9 || true)
+        "${repo}/functest-kubernetes-core:amd64-hunter" golang:1.11-alpine3.9 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|golang:1.11.6-alpine3.9|arm64v8/golang:1.11.6-alpine3.9|g" {} +
+    -e "s|golang:1.11-alpine3.9|arm64v8/golang:1.11-alpine3.9|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:1.11.6-alpine3.9 || true)
+        arm64v8/golang:1.11-alpine3.9 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index ab96ce0c..869a76f4 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.11.6-alpine3.9
+FROM golang:1.11-alpine3.9
 
 ARG BRANCH=stable/hunter
 ARG OPENSTACK_TAG=stable/rocky