aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2020-03-24 07:48:53 +0000
committerGerrit Code Review <gerrit@opnfv.org>2020-03-24 07:48:53 +0000
commitfa573a5c0aae16aecb4bc521b34b71af4a263a6f (patch)
treeea35e1fe101aee67d9a39bb69eae78b2a341ee03
parent80fd8ceb7caa7c04324946a9c84d8e439247ad10 (diff)
parentd3f97d3699ad3082ae3871f18fecfc0edf519ea6 (diff)
Merge "Remove duplicated packages in VNF Dockerfile"
-rw-r--r--docker/vnf/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index dc5290de0..b59a97574 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 g++ make && \
+ 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 /^tempest==+.*$/d upper-constraints.txt && \
case $(uname -m) in aarch*|arm*) sed -i -E /^PyNaCl=/d upper-constraints.txt ;; esac && \