Update to Apine 3.9

It updates to the latest Alpine release [1]

[1] https://www.alpinelinux.org/posts/Alpine-3.9.0-released.html

Change-Id: I4afbc1d4830647f11509a02df5820ce7d33541ae
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 443b83ef45b4b58b46dcf0c4a7e50e9d379547ff)

diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile
index 273fd4c..b6f68ef 100644 (file)
--- a/docker/core/Dockerfile
+++ b/docker/core/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.11.1-alpine3.8
+FROM golang:1.11.6-alpine3.9
 
 ARG BRANCH=stable/hunter
 ARG OPENSTACK_TAG=stable/rocky

diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index 027526b..1629cfc 100644 (file)
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -6,7 +6,7 @@ ARG OPNFV_TAG=stable/hunter
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
 RUN apk --no-cache add --update make py-pip bash git go \
         grep rsync linux-headers musl-dev findutils \
-        libffi libssl1.0 libjpeg-turbo && \
+        libffi openssl libjpeg-turbo && \
     apk --no-cache add --virtual .build-deps --update \
         python-dev libffi-dev openssl-dev libjpeg-turbo-dev && \
     pip install \

diff --git a/docker/healthcheck/Dockerfile b/docker/healthcheck/Dockerfile
index 301bc51..31747ab 100644 (file)
--- a/docker/healthcheck/Dockerfile
+++ b/docker/healthcheck/Dockerfile
@@ -4,7 +4,7 @@ ARG K8S_TAG=v1.13.4
 
 RUN apk --no-cache add --update make py-pip bash git \
         grep rsync linux-headers musl-dev findutils \
-        libffi libssl1.0 libjpeg-turbo && \
+        libffi openssl libjpeg-turbo && \
     apk --no-cache add --virtual .build-deps --update \
         gcc python-dev libffi-dev openssl-dev libjpeg-turbo-dev && \
     git init /src/k8s.io/kubernetes && \