From: Cédric Ollivier Date: Tue, 17 Mar 2020 20:04:11 +0000 (+0100) Subject: Remove a duplicated package X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=f0dba28556703de81a5725cd0048b9972fae7ade;p=functest.git Remove a duplicated package Change-Id: I7f9c5b5e2c59f23ada721e7209bec56bfa23ae9e Signed-off-by: Cédric Ollivier (cherry picked from commit b732b5b53e1b46e406b8ebfcff16466e2543cd67) --- diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile index 0fb83ff6e..d5e461c31 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++ make && \ + ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev g++ && \ 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 && \