NFVBENCH-138 Use yaml.safe_load() instead of unsafe yaml load

[nfvbench.git] / docker / Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1980575..920e3a3 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,8 +1,11 @@
 # docker file for creating a container that has nfvbench installed and ready to use
 FROM ubuntu:16.04
 
-ENV TREX_VER "v2.53"
-ENV VM_IMAGE_VER "0.6"
+ENV TREX_VER "v2.56"
+ENV VM_IMAGE_VER "0.9"
+
+# Note: do not clone with --depth 1 as it will cause pbr to fail extracting the nfvbench version
+# from the git tag
 
 RUN apt-get update && apt-get install -y \
        git \
@@ -13,8 +16,8 @@ RUN apt-get update && apt-get install -y \
        vim \
        wget \
        net-tools \
+       iproute2 \
        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 \
@@ -24,11 +27,13 @@ RUN apt-get update && apt-get install -y \
        && cp -a /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex /usr/local/lib/python2.7/dist-packages/ \
        && rm -rf /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex \
        && sed -i -e "s/2048 /512 /" -e "s/2048\"/512\"/" /opt/trex/$TREX_VER/trex-cfg \
-       && pip install -U pip pbr \
-       && hash -r pip \
+       && apt-get remove -y python-pip \
+       && wget https://bootstrap.pypa.io/get-pip.py \
+       && python get-pip.py \
+       && pip install -U pbr \
        && pip install -U setuptools \
        && cd / \
-       && git clone --depth 1 https://gerrit.opnfv.org/gerrit/nfvbench \
+       && git clone 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 \