From 277ddd145f3a8a7495ed9dba4676048e47e52d86 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Fri, 29 Mar 2019 08:56:33 +0100
Subject: [PATCH] Only set go major version in parent container
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

It allows updating automatically the minor versions.

Change-Id: If6b8bcd1d7508653f4e28e4c1025bcd970ed98bf
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 ansible/site.yml       | 2 +-
 build.sh               | 6 +++---
 docker/core/Dockerfile | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ansible/site.yml b/ansible/site.yml
index 516a1f81..3fde7eb6 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -13,7 +13,7 @@
           - repo: _
             dport:
             container: golang
-            tag: 1.12.1-alpine3.9
+            tag: 1.12-alpine3.9
         steps:
           - name: build opnfv/functest-kubernetes-core
             containers:
diff --git a/build.sh b/build.sh
index 3093deb9..7dce178c 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-iruya" golang:1.12.1-alpine3.9 || true)
+        "${repo}/functest-kubernetes-core:amd64-iruya" golang:1.12-alpine3.9 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|golang:1.12.1-alpine3.9|arm64v8/golang:1.12.1-alpine3.9|g" {} +
+    -e "s|golang:1.12-alpine3.9|arm64v8/golang:1.12-alpine3.9|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-kubernetes-core:iruya|\
 ${repo}/functest-kubernetes-core:arm64-iruya|g" {} +
@@ -49,7 +49,7 @@ for dir in ${arm64_dirs}; do
 done
 [ ! -z "${arm64_dirs}" ] &&
     (docker rmi "${repo}/functest-kubernetes-core:arm64-iruya" \
-        arm64v8/golang:1.11.6-alpine3.9 || true)
+        arm64v8/golang:1.12-alpine3.9 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 199295c8..bb511693 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.12.1-alpine3.9
+FROM golang:1.12-alpine3.9
 
 ARG BRANCH=stable/iruya
 ARG OPENSTACK_TAG=stable/stein
-- 
2.16.6