X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2FDockerfile;h=bcec2abd9783d1616134a967e9ab82c2bf06eaca;hb=298511bb572ffeb460f7ccbebe06233a17e6b794;hp=1f61eab4ccdfa840e08b83a3f0d9732c1e93c871;hpb=a63d257a7b2cdbf18626d9963ac188317cf768b7;p=nfvbench.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1f61eab..bcec2ab 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.32"
+ENV NFVBENCH_TAG "1.2.2"
+ENV VM_IMAGE_VER "0.5"
 
 RUN apt-get update && apt-get install -y \
        git \
@@ -14,8 +14,10 @@ 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 \
        && 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 \
@@ -25,7 +27,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 \