summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorahothan <ahothan@cisco.com>2018-04-27 11:12:57 -0700
committerahothan <ahothan@cisco.com>2018-04-27 11:12:57 -0700
commitc8402089ad8686a16ad08ce6c6e16a14c3144d64 (patch)
tree73664eed53a3e4739d2fe27f8a7dcaaf53cf9bd3
parentdc42abd840d4bb6519062da794a817ce51655f47 (diff)
Change nfvbench git checkout to stable/fraser in Dockerfileopnfv-6.1.0opnfv-6.0.0stable/fraser
Change-Id: I206bc8d0d06e429fd632a37f80c89b16664c8443 Signed-off-by: ahothan <ahothan@cisco.com>
-rw-r--r--.gitignore1
-rw-r--r--docker/Dockerfile3
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 322c5b2..8842f79 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
.tox
.cache
.eggs
+.pytest_cache/
venv
nfvbench.egg-info
nfvbenchvm/dib/dib-venv
diff --git a/docker/Dockerfile b/docker/Dockerfile
index a30f648..9f09d3b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -2,7 +2,7 @@
FROM ubuntu:16.04
ENV TREX_VER "v2.32"
-ENV NFVBENCH_TAG "1.3.0"
+ENV NFVBENCH_TAG "stable/fraser"
ENV VM_IMAGE_VER "0.6"
RUN apt-get update && apt-get install -y \
@@ -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"]
-