X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2FDockerfile;h=1cb7c71ed7f2ee53583b6859363147be3a6d0eb7;hb=057486b092e0a4bb1989121588eb5f8afdb8e1d3;hp=198057569e4da48398fe692e0dcd5064b52c3637;hpb=e1887dcf96c21e96f259a94f5e6835d45b27dfdf;p=nfvbench.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 1980575..1cb7c71 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,37 +1,45 @@
 # 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.61"
+ENV VM_IMAGE_VER "0.12"
+ENV PYTHONIOENCODING "utf8"
+
+# 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 software-properties-common
+
+RUN add-apt-repository -y ppa:deadsnakes/ppa
 
 RUN apt-get update && apt-get install -y \
        git \
        kmod \
        pciutils \
-       python \
-       python-pip \
+       python3.6 \
        vim \
        wget \
        net-tools \
+       iproute2 \
        libelf1 \
-       && mkdir /tmp/http_root \
+       && ln -s /usr/bin/python3.6 /usr/local/bin/python3 \
        && mkdir -p /opt/trex \
        && mkdir /var/log/nfvbench \
        && wget --no-cache https://trex-tgn.cisco.com/trex/release/$TREX_VER.tar.gz \
        && tar xzf $TREX_VER.tar.gz -C /opt/trex \
        && rm -f /$TREX_VER.tar.gz \
        && rm -f /opt/trex/$TREX_VER/trex_client_$TREX_VER.tar.gz \
-       && cp -a /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex /usr/local/lib/python2.7/dist-packages/ \
+       && cp -a /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex /usr/local/lib/python3.6/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 \
-       && pip install -U setuptools \
+       && wget https://bootstrap.pypa.io/get-pip.py \
+       && python3 get-pip.py \
+       && pip3 install -U pbr \
+       && pip3 install -U setuptools \
        && cd / \
-       && git clone --depth 1 https://gerrit.opnfv.org/gerrit/nfvbench \
-       && cd /nfvbench && pip install -e . \
+       && git clone https://gerrit.opnfv.org/gerrit/nfvbench \
+       && cd /nfvbench && pip3 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 \
+       && python3 ./docker/cleanup_generators.py \
        && rm -rf /nfvbench/.git \
        && apt-get remove -y wget git \
        && apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/*