X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2FDockerfile;h=6d694651c3135147b547b92137f17a6150e6cde6;hb=98aac3b7ed5060d2e498d4ab545482a525339120;hp=3df8c8ba085d6d5aad2989cb8cfa33db828ff8ee;hpb=e8a898337fcdc5e39721f187dabdfd0a51974986;p=nfvbench.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3df8c8b..6d69465 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,9 +1,11 @@
 # docker file for creating a container that has nfvbench installed and ready to use
 FROM ubuntu:16.04
 
-ENV TREX_VER "v2.32"
-ENV NFVBENCH_TAG "1.3.1"
-ENV VM_IMAGE_VER "0.6"
+ENV TREX_VER "v2.61"
+ENV VM_IMAGE_VER "0.10"
+
+# Note: do not clone with --depth 1 as it will cause pbr to fail extracting the nfvbench version
+# from the git tag
 
 RUN apt-get update && apt-get install -y \
        git \
@@ -14,21 +16,24 @@ RUN apt-get update && apt-get install -y \
        vim \
        wget \
        net-tools \
+       iproute2 \
        libelf1 \
-       && mkdir /tmp/http_root \
        && mkdir -p /opt/trex \
        && mkdir /var/log/nfvbench \
        && wget --no-cache 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 \
        && rm -f /opt/trex/$TREX_VER/trex_client_$TREX_VER.tar.gz \
-       && cp -a /opt/trex/$TREX_VER/automation/trex_control_plane/stl/trex_stl_lib /usr/local/lib/python2.7/dist-packages/ \
-       && rm -rf /opt/trex/$TREX_VER/automation/trex_control_plane/stl/trex_stl_lib \
+       && cp -a /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex /usr/local/lib/python2.7/dist-packages/ \
+       && rm -rf /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex \
        && sed -i -e "s/2048 /512 /" -e "s/2048\"/512\"/" /opt/trex/$TREX_VER/trex-cfg \
-       && pip install -U pip pbr \
+       && apt-get remove -y python-pip \
+       && wget https://bootstrap.pypa.io/get-pip.py \
+       && python get-pip.py \
+       && pip install -U pbr \
        && pip install -U setuptools \
        && cd / \
-       && git clone --depth 1 -b $NFVBENCH_TAG https://gerrit.opnfv.org/gerrit/nfvbench \
+       && git clone https://gerrit.opnfv.org/gerrit/nfvbench \
        && cd /nfvbench && pip install -e . \
        && wget -O nfvbenchvm-$VM_IMAGE_VER.qcow2 http://artifacts.opnfv.org/nfvbench/images/nfvbenchvm_centos-$VM_IMAGE_VER.qcow2 \
        && python ./docker/cleanup_generators.py \
@@ -36,7 +41,7 @@ RUN apt-get update && apt-get install -y \
        && apt-get remove -y wget git \
        && apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-ENV TREX_STL_EXT_PATH "/opt/trex/$TREX_VER/external_libs"
+ENV TREX_EXT_LIBS "/opt/trex/$TREX_VER/external_libs"
 
-ENTRYPOINT ["/nfvbench/docker/nfvbench-entrypoint.sh"]
 
+ENTRYPOINT ["/nfvbench/docker/nfvbench-entrypoint.sh"]