diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-03-18 21:20:28 +0100 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-03-28 07:27:38 +0100 |
| commit | 5b688cae66f20421ff7ff69bdfe1ca1078dcb90a (patch) | |
| tree | 8cc48691728c6d579bf024b55491ca294e9de2f1 /docker | |
| parent | 90fc7be694f847b05a76d61a8821f48b00913578 (diff) | |
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)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/core/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/features/Dockerfile | 2 | ||||
| -rw-r--r-- | docker/healthcheck/Dockerfile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 5b88a577..c84861e9 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:alpine3.8 +FROM golang:alpine3.9 ARG BRANCH=master ARG OPENSTACK_TAG=master diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile index ea3bf6e3..16712ab5 100644 --- a/docker/features/Dockerfile +++ b/docker/features/Dockerfile @@ -6,7 +6,7 @@ ARG OPNFV_TAG=master 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 371a1258..bafc3c4d 100644 --- a/docker/healthcheck/Dockerfile +++ b/docker/healthcheck/Dockerfile @@ -4,7 +4,7 @@ ARG K8S_TAG=master 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 && \ |