X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2FDockerfile;h=46be73366c76f604fdc99be8f55b8a411d5580c6;hb=9ecf6399cde8499b3a879cd8417cc3e376cc87be;hp=e3e0eabf0918b1b2a197a45c5892b737853339e0;hpb=f3fdcd28c6f4d8707de18afec5ca67f8b90d02c8;p=nfvbench.git

diff --git a/docker/Dockerfile b/docker/Dockerfile
index e3e0eab..46be733 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,41 +1,53 @@
 # 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.32"
-ENV NFVBENCH_TAG "1.5.0"
-ENV VM_IMAGE_VER "0.6"
+ENV TREX_VER "v2.89"
+ENV VM_IMAGE_VER "0.15"
+ENV PYTHONIOENCODING "utf8"
 
 RUN apt-get update && apt-get install -y \
        git \
        kmod \
        pciutils \
-       python \
-       python-pip \
+       python3.8 \
        vim \
        wget \
        net-tools \
+       iproute2 \
        libelf1 \
-       && mkdir /tmp/http_root \
+       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/stl/trex_stl_lib /usr/local/lib/python2.7/dist-packages/ \
-       && 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 \
-       && pip install -U setuptools \
-       && cd / \
-       && git clone --depth 1 -b $NFVBENCH_TAG https://gerrit.opnfv.org/gerrit/nfvbench \
-       && cd /nfvbench && pip install -e . \
+       && 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 \
+       && wget https://bootstrap.pypa.io/get-pip.py \
+       && 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 && 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 \
+       && 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_STL_EXT_PATH "/opt/trex/$TREX_VER/external_libs"
+ENV TREX_EXT_LIBS "/opt/trex/$TREX_VER/external_libs"
 
-ENTRYPOINT ["/nfvbench/docker/nfvbench-entrypoint.sh"]
+
+ENTRYPOINT ["/opt/nfvbench/docker/nfvbench-entrypoint.sh"]