summaryrefslogtreecommitdiffstats
path: root/docker/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'docker/Dockerfile')
-rw-r--r--docker/Dockerfile7
1 files changed, 3 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index bcec2ab..cd59fa0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,8 +2,7 @@
FROM ubuntu:16.04
ENV TREX_VER "v2.32"
-ENV NFVBENCH_TAG "1.2.2"
-ENV VM_IMAGE_VER "0.5"
+ENV VM_IMAGE_VER "0.6"
RUN apt-get update && apt-get install -y \
git \
@@ -26,9 +25,10 @@ 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 \
+ && 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 \
@@ -39,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"]
-