From b9c20a1a137b4d093964d4a019baf58e42572717 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Sat, 6 Jun 2020 17:50:40 +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: Ie7c72abd10d70b90d65f260d595c0ca47b69a8c0 Signed-off-by: Cédric Ollivier --- docker/core/Dockerfile | 2 +- docker/vnf/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'docker') diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 5c5008b3d..502e87f93 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM alpine:3.12 ARG BRANCH=master ARG OPENSTACK_TAG=master diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 38ca42d21..3e477c05c 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -22,7 +22,7 @@ RUN apk --no-cache add --update \ ruby ruby-bundler ruby-irb ruby-rdoc \ procps libxslt libxml2 zlib libffi go musl-dev && \ apk --no-cache add --virtual .build-deps --update \ - ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ + ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev patch && \ wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ sed -i -E /^tempest==+.*$/d upper-constraints.txt && \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \ -- cgit 1.2.3-korg