X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2FDockerfile;h=4336261f94c734233727a0fbdb0223434fabad82;hb=0e9691d0baa4ac2e0a8f22b15e425a1bdf133be7;hp=15196f2f58764a4ba0192a0df5ef8a199b15a2ee;hpb=bb04d1d32543b4e00400dbd736d4d48dc195a0b7;p=nfvbench.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 15196f2..4336261 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,53 +1,55 @@
 # docker file for creating a container that has nfvbench installed and ready to use
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
-ENV TREX_VER "v2.54"
-ENV VM_IMAGE_VER "0.6"
+ENV TREX_VER "v2.89"
+ENV VM_IMAGE_VER "0.14"
+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
-
-# 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 \
        pciutils \
-       python \
-       python-pip \
+       python3.8 \
        vim \
        wget \
        net-tools \
        iproute2 \
        libelf1 \
+       python3-dev \
+       libpython3.8-dev \
+       python3-distutils \
+       gcc \
+       && ln -s /usr/bin/python3.8 /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 \
+       && wget --no-cache --no-check-certificate 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.8/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 \
-       && pip install -U pbr \
-       && pip install -U setuptools \
-       && cd / \
+       && python3 get-pip.py \
+       && pip3 install -U pbr \
+       && pip3 install -U setuptools \
+       && cd /opt \
+       # Note: do not clone with --depth 1 as it will cause pbr to fail extracting the nfvbench version
+       # from the git tag
        && git clone https://gerrit.opnfv.org/gerrit/nfvbench \
-       && cd /nfvbench && pip install -e . \
+       && 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 \
-       && rm -rf /nfvbench/.git \
-       && apt-get remove -y wget git \
+       # Override Xtesting testcases.yaml file by NFVbench default one
+       && cp xtesting/testcases.yaml /usr/local/lib/python3.8/dist-packages/xtesting/ci/testcases.yaml \
+       # Temporary override waiting for PR approval : https://gerrit.opnfv.org/gerrit/c/functest-xtesting/+/72431
+       && cp xtesting/behaveframework.py /usr/local/lib/python3.8/dist-packages/xtesting/core/behaveframework.py \
+       && python3 ./docker/cleanup_generators.py \
+       && rm -rf /opt/nfvbench/.git \
+       # Symlink for retrocompatibility 4.x
+       && ln -s /opt/nfvbench /nfvbench \
+       && apt-get remove -y wget git python3-dev libpython3.8-dev gcc \
        && apt-get autoremove -y && apt-get clean && rm -rf /var/lib/apt/lists/*
 
 ENV TREX_EXT_LIBS "/opt/trex/$TREX_VER/external_libs"
 
 
-ENTRYPOINT ["/nfvbench/docker/nfvbench-entrypoint.sh"]
+ENTRYPOINT ["/opt/nfvbench/docker/nfvbench-entrypoint.sh"]