X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2FDockerfile;h=cd59fa0efc06e2aa780c5396380654f825dd526b;hb=3dfb5268ebfada08c1a2316708564e627f86da42;hp=1bc9246aa6bcc0d50d24ea9b9d1c4510dcf97ded;hpb=ce9950c0e12b173024fedbfff889c7ad4c62ae9e;p=nfvbench.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1bc9246..cd59fa0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,9 +1,8 @@
 # docker file for creating a container that has nfvbench installed and ready to use
 FROM ubuntu:16.04
 
-COPY . /nfvbench
-
-ENV TREX_VER "v2.27"
+ENV TREX_VER "v2.32"
+ENV VM_IMAGE_VER "0.6"
 
 RUN apt-get update && apt-get install -y \
        git \
@@ -14,6 +13,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 \
@@ -25,8 +25,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 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 \
@@ -35,4 +39,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"]
-