Merge "Add no-check-certificate option in TRex release download to avoid error on...

diff --combined docker/Dockerfile
index 8dc1e2f,8cebd47..2ae8c83
--- 1/docker/Dockerfile
--- 2/docker/Dockerfile
+++ b/docker/Dockerfile
@@@ -1,7 -1,7 +1,7 @@@
  # docker file for creating a container that has nfvbench installed and ready to use
  FROM ubuntu:16.04
  
 -ENV TREX_VER "v2.61"
 +ENV TREX_VER "v2.79"
  ENV VM_IMAGE_VER "0.12"
  ENV PYTHONIOENCODING "utf8"
  
@@@ -23,16 -23,14 +23,14 @@@ RUN apt-get update && apt-get install -
         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 \