From 992606d988814e9fdda83fd0398941037c8e3ae6 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 6 Jun 2020 18:04:35 +0200
Subject: Update to alpine3.12
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://alpinelinux.org/posts/Alpine-3.12.0-released.html

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

diff --git a/ansible/site.yml b/ansible/site.yml
index 829f51a2..f9e2c74a 100644
--- a/ansible/site.yml
+++ b/ansible/site.yml
@@ -10,7 +10,7 @@
           - repo: _
             dport:
             container: golang
-            tag: 1.13-alpine3.11
+            tag: 1.13-alpine3.12
         steps:
           - name: build opnfv/functest-kubernetes-core
             containers:
diff --git a/build.sh b/build.sh
index a61ecb75..f69549db 100644
--- a/build.sh
+++ b/build.sh
@@ -30,11 +30,11 @@ done
 [ ! -z "${amd64_dirs}" ] &&
     (docker rmi \
         "${repo}/functest-kubernetes-core:amd64-latest" \
-        golang:1.13-alpine3.11 || true)
+        golang:1.13-alpine3.12 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 find . -name Dockerfile -exec sed -i \
-    -e "s|golang:1.13-alpine3.11|arm64v8/golang:1.13-alpine3.11|g" {} +
+    -e "s|golang:1.13-alpine3.12|arm64v8/golang:1.13-alpine3.12|g" {} +
 find . -name Dockerfile -exec sed -i \
     -e "s|opnfv/functest-kubernetes-core|\
 ${repo}/functest-kubernetes-core:arm64-latest|g" {} +
@@ -51,7 +51,7 @@ for dir in ${arm64_dirs}; do
 done
 [ ! -z "${arm64_dirs}" ] &&
     (docker rmi "${repo}/functest-kubernetes-core:arm64-latest" \
-        arm64v8/golang:1.13-alpine3.11 || true)
+        arm64v8/golang:1.13-alpine3.12 || true)
 find . -name Dockerfile -exec git checkout {} +
 
 exit $?
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 2f1723d4..11bcc16c 100644
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,11 +1,11 @@
-FROM golang:1.13-alpine3.11
+FROM golang:1.13-alpine3.12
 
 ARG BRANCH=master
 ARG OPENSTACK_TAG=master
 ARG OPNFV_TAG=master
 
 COPY Try-a-quick-fix-vs-asynchronuous-issues.patch /tmp/Try-a-quick-fix-vs-asynchronuous-issues.patch
-RUN apk --no-cache add --update python3 bash git grep libffi openssl mailcap && \
+RUN apk --no-cache add --update python3 py3-pip bash git grep libffi openssl mailcap && \
     apk --no-cache add --virtual .build-deps --update \
         python3-dev build-base libffi-dev openssl-dev && \
     git init /src/functest-kubernetes && \
-- 
cgit 1.2.3-korg