Code Review
/
nfvbench.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Move to tag 1.2.2
[nfvbench.git]
/
docker
/
Dockerfile
diff --git
a/docker/Dockerfile
b/docker/Dockerfile
index
9333588
..
bcec2ab
100644
(file)
--- a/
docker/Dockerfile
+++ b/
docker/Dockerfile
@@
-1,8
+1,9
@@
# docker file for creating a container that has nfvbench installed and ready to use
FROM ubuntu:16.04
# docker file for creating a container that has nfvbench installed and ready to use
FROM ubuntu:16.04
-ENV TREX_VER "v2.29"
-ENV NFVBENCH_TAG "1.0.7"
+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 \
RUN apt-get update && apt-get install -y \
git \
@@
-13,6
+14,7
@@
RUN apt-get update && apt-get install -y \
vim \
wget \
net-tools \
vim \
wget \
net-tools \
+ libelf1 \
&& mkdir /tmp/http_root \
&& mkdir -p /opt/trex \
&& mkdir /var/log/nfvbench \
&& mkdir /tmp/http_root \
&& mkdir -p /opt/trex \
&& mkdir /var/log/nfvbench \
@@
-28,6
+30,7
@@
RUN apt-get update && apt-get install -y \
&& cd / \
&& git clone --depth 1 -b $NFVBENCH_TAG https://gerrit.opnfv.org/gerrit/nfvbench \
&& cd /nfvbench && pip install -e . \
&& 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 \
&& python ./docker/cleanup_generators.py \
&& rm -rf /nfvbench/.git \
&& apt-get remove -y wget git \