Switch to golang:alpine3.8 as based image

Releng model forces the same Docker base image in all branches.
It's less precised that the Functest CI model (see collivier.xtesting).

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

diff --git a/build.sh b/build.sh
index 7bb563e..8a8bdf3 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -32,7 +32,7 @@ done
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|golang:1.11.1-alpine3.8|arm64v8/golang:1.11.1-alpine3.8|g" {} +
+    -e "s|golang:1.11.1-alpine3.8|arm64v8/golang: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:1.11.1-alpine3.8 || true)
+        arm64v8/golang:alpine3.8 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?

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