From 76265bfab6197d657a940ed99391463015f435a1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?C=C3=A9dric=20Ollivier?= <cedric.ollivier@orange.com>
Date: Sun, 16 Aug 2020 11:56:12 +0200
Subject: [PATCH] Leverage alpine rather than golang
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

golang is now useless as we stop compiling kubernetes binaries.

Change-Id: I7b9416281de069d1f454b13eff6e9e6107f7471e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 1af6a5dc4ec8e087613275e912c819ea1d0aecbc)
---
 ansible/site.yml       |  4 ++--
 build.sh               | 10 +++++-----
 docker/core/Dockerfile |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ansible/site.yml b/ansible/site.yml
index 7144921b..6b7ab2ee 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -12,8 +12,8 @@
         dependencies:
           - repo: _
             dport:
-            container: golang
-            tag: 1.13-alpine3.10
+            container: alpine
+            tag: 3.10
         steps:
           - name: build opnfv/functest-kubernetes-core
             containers:
diff --git a/build.sh b/build.sh
index c8a98d2b..7074e0f3 100644
--- a/build.sh
+++ b/build.sh
@@ -31,11 +31,11 @@ done
 [ ! -z "${amd64_dirs}" ] &&
     (docker rmi \
         "${repo}/functest-kubernetes-core:amd64-jerma" \
-        golang:1.13-alpine3.10 || true)
+        alpine:3.10 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|golang:1.13-alpine3.10|arm64v8/golang:1.13-alpine3.10|g" {} +
+    -e "s|alpine:3.10|arm64v8/alpine:3.10|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-kubernetes-core:jerma|\
 ${repo}/functest-kubernetes-core:arm64-jerma|g" {} +
@@ -52,11 +52,11 @@ for dir in ${arm64_dirs}; do
 done
 [ ! -z "${arm64_dirs}" ] &&
     (docker rmi "${repo}/functest-kubernetes-core:arm64-jerma" \
-        arm64v8/golang:1.13-alpine3.10 || true)
+        arm64v8/alpine:3.10 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|golang:1.13-alpine3.10|arm32v7/golang:1.13-alpine3.10|g" {} +
+    -e "s|alpine:3.10|arm32v7/alpine:3.10|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-kubernetes-core:jerma|\
 ${repo}/functest-kubernetes-core:arm-jerma|g" {} +
@@ -73,7 +73,7 @@ for dir in ${arm_dirs}; do
 done
 [ ! -z "${arm_dirs}" ] &&
     (docker rmi "${repo}/functest-kubernetes-core:arm-jerma" \
-        arm32v7/golang:1.13-alpine3.10 || true)
+        arm32v7/alpine:3.10 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 583be6b4..360bdcf1 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.13-alpine3.10
+FROM alpine:3.10
 
 ARG BRANCH=stable/jerma
 ARG OPENSTACK_TAG=stable/train
-- 
2.16.6