aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2020-03-24 08:50:29 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2020-03-24 08:51:37 +0100
commit40e7f94f247bfe9d499470b4c859b42a3054665a (patch)
tree9fb9b4c3d6ecd604ab3d8faa99837377a33597f4 /docker
parent782a5cf958ddd03bb1e2d633e5222a19408255ee (diff)
Remove duplicated g++ in vnf/Dockerfile
Co-Authored-By: Juha Kosonen <juha.kosonen@nokia.com> Change-Id: I63fbeb8d2a0941d9b3492c97e14a139ba050ad7d Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com> (cherry picked from commit 1413d32a207502f88675e379264765687230884b)
Diffstat (limited to 'docker')
-rw-r--r--docker/vnf/Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/vnf/Dockerfile b/docker/vnf/Dockerfile
index 04df114e4..9ff65c6e0 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 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 && \