X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2FDockerfile;h=ec738ee32c98c18f86f1e30af3ce0430f4b6ed30;hb=eef8ece12a26773ae2459d36225018430ef00ede;hp=e6e27ae25ff7d2ec18c3fd59333367dc3068ad68;hpb=078f4bba85b5b873bb27dc48025892a7135ea61e;p=nfvbench.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index e6e27ae..ec738ee 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,9 @@
 # docker file for creating a container that has nfvbench installed and ready to use
 FROM ubuntu:16.04
 
-ENV TREX_VER "v2.27"
-ENV NFVBENCH_TAG "1.0.6"
+ENV TREX_VER "v2.32"
+ENV NFVBENCH_TAG "1.5.1"
+ENV VM_IMAGE_VER "0.6"
 
 RUN apt-get update && apt-get install -y \
        git \
@@ -13,6 +14,7 @@ RUN apt-get update && apt-get install -y \
        vim \
        wget \
        net-tools \
+       libelf1 \
        && mkdir /tmp/http_root \
        && mkdir -p /opt/trex \
        && mkdir /var/log/nfvbench \
@@ -24,10 +26,12 @@ RUN apt-get update && apt-get install -y \
        && rm -rf /opt/trex/$TREX_VER/automation/trex_control_plane/stl/trex_stl_lib \
        && sed -i -e "s/2048 /512 /" -e "s/2048\"/512\"/" /opt/trex/$TREX_VER/trex-cfg \
        && pip install -U pip pbr \
+       && hash -r pip \
        && pip install -U setuptools \
        && cd / \
        && git clone --depth 1 -b $NFVBENCH_TAG 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 \
        && rm -rf /nfvbench/.git \
        && apt-get remove -y wget git \
@@ -36,4 +40,3 @@ RUN apt-get update && apt-get install -y \
 ENV TREX_STL_EXT_PATH "/opt/trex/$TREX_VER/external_libs"
 
 ENTRYPOINT ["/nfvbench/docker/nfvbench-entrypoint.sh"]
-