From 5a56241b9c9e5ceb8bde6ee3e75d0096cc0a056c Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Tue, 24 Mar 2020 08:50:29 +0100 Subject: Remove duplicated g++ in vnf/Dockerfile MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Juha Kosonen Change-Id: I63fbeb8d2a0941d9b3492c97e14a139ba050ad7d Signed-off-by: Cédric Ollivier (cherry picked from commit 1413d32a207502f88675e379264765687230884b) --- docker/vnf/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/vnf') diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index d5e461c31..4cdf64b66 100644 --- a/docker/vnf/Dockerfile +++ b/docker/vnf/Dockerfile @@ -23,7 +23,7 @@ RUN apk --no-cache add --update \ ruby ruby-bundler ruby-irb ruby-rdoc \ procps libxslt libxml2 zlib libffi python3 go musl-dev && \ apk --no-cache add --virtual .build-deps --update \ - ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev g++ && \ + ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \ wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ sed -i -E s/^tempest==+.*$/-e\ git+https:\\/\\/opendev.org\\/openstack\\/tempest@$TEMPEST_TAG#egg=tempest/ upper-constraints.txt && \ case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \ -- cgit 1.2.3-korg