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

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1bc9246..6ad93e4 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,9 +1,9 @@
 # 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.29"
+ENV NFVBENCH_TAG "1.0.10"
+ENV VM_IMAGE_VER "0.4"
 
 RUN apt-get update && apt-get install -y \
        git \
@@ -26,7 +26,10 @@ RUN apt-get update && apt-get install -y \
        && sed -i -e "s/2048 /512 /" -e "s/2048\"/512\"/" /opt/trex/$TREX_VER/trex-cfg \
        && pip install -U pip pbr \
        && 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 \