X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2FDockerfile;h=cd59fa0efc06e2aa780c5396380654f825dd526b;hb=3dfb5268ebfada08c1a2316708564e627f86da42;hp=a30f6482a2b2180aebe1a02b1b9a0a722e524101;hpb=e1df419918039eda72c0237729511c83b4cdb380;p=nfvbench.git diff --git a/docker/Dockerfile b/docker/Dockerfile index a30f648..cd59fa0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -2,7 +2,6 @@ FROM ubuntu:16.04 ENV TREX_VER "v2.32" -ENV NFVBENCH_TAG "1.3.0" ENV VM_IMAGE_VER "0.6" RUN apt-get update && apt-get install -y \ @@ -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"] -