X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2FDockerfile;h=6d694651c3135147b547b92137f17a6150e6cde6;hb=98aac3b7ed5060d2e498d4ab545482a525339120;hp=15196f2f58764a4ba0192a0df5ef8a199b15a2ee;hpb=bb04d1d32543b4e00400dbd736d4d48dc195a0b7;p=nfvbench.git diff --git a/docker/Dockerfile b/docker/Dockerfile index 15196f2..6d69465 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,17 +1,12 @@ # docker file for creating a container that has nfvbench installed and ready to use FROM ubuntu:16.04 -ENV TREX_VER "v2.54" -ENV VM_IMAGE_VER "0.6" +ENV TREX_VER "v2.61" +ENV VM_IMAGE_VER "0.10" # Note: do not clone with --depth 1 as it will cause pbr to fail extracting the nfvbench version # from the git tag -# Trex v2.54: -# workaround a problem when using --unbind-unused-ports with t-rex-64 -# instead patch t-rex-64 directly to add --unbind-unused-ports when calling ./trex-cfg -# so that the new arg is not passed to _t-rex-64 -# RUN apt-get update && apt-get install -y \ git \ kmod \ @@ -32,7 +27,6 @@ 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 \ - && sed -i -e "s/trex-cfg/trex-cfg --unbind-unused-ports/" /opt/trex/$TREX_VER/t-rex-64 \ && apt-get remove -y python-pip \ && wget https://bootstrap.pypa.io/get-pip.py \ && python get-pip.py \