diff options
| author |   Alec Hothan <ahothan@cisco.com> | 2020-04-27 14:15:42 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2020-04-27 14:15:42 +0000 |
| commit | a302be9afab5879a8f52153202ff972712d6b2e8 (patch) | |
| tree | 21b7bba1cdeddfe4a5ca9bc040afef7d97ab6bab /docker | |
| parent | e385fc9fd107508b897ce042c27f0775c406eea5 (diff) | |
| parent | eca4818caf553f8950934bc9ee05ce26162d395f (diff) | |
Merge "Add no-check-certificate option in TRex release download to avoid error on image build"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/Dockerfile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 8dc1e2f..2ae8c83 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -23,16 +23,14 @@ RUN apt-get update && apt-get install -y \ iproute2 \ libelf1 \ && ln -s /usr/bin/python3.6 /usr/local/bin/python3 \ - && mkdir -p /opt/trex/$TREX_VER \ + && mkdir -p /opt/trex \ && mkdir /var/log/nfvbench \ - && mkdir /tmp/trex \ - && wget --no-cache https://github.com/cisco-system-traffic-generator/trex-core/archive/$TREX_VER.tar.gz \ - && tar xzf $TREX_VER.tar.gz --strip-components=1 -C /tmp/trex \ + && wget --no-cache --no-check-certificate https://trex-tgn.cisco.com/trex/release/$TREX_VER.tar.gz \ + && tar xzf $TREX_VER.tar.gz -C /opt/trex \ && rm -f /$TREX_VER.tar.gz \ - && cp -a /tmp/trex/scripts/automation/trex_control_plane/interactive/trex /usr/local/lib/python3.6/dist-packages/ \ - && cp -a /tmp/trex/scripts/* /opt/trex/$TREX_VER/ \ + && rm -f /opt/trex/$TREX_VER/trex_client_$TREX_VER.tar.gz \ + && cp -a /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex /usr/local/lib/python3.6/dist-packages/ \ && rm -rf /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex \ - && rm -rf /tmp/trex \ && wget https://bootstrap.pypa.io/get-pip.py \ && python3 get-pip.py \ && pip3 install -U pbr \ |