NFVBENCH-195: Work around a fatal error encountered with the latest pip release,...

[nfvbench.git] / docker / Dockerfile

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8dc1e2f..990f07e 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -22,19 +22,20 @@ RUN apt-get update && apt-get install -y \
        net-tools \
        iproute2 \
        libelf1 \
+       python3-dev \
+       libpython3.6-dev \
+       gcc \
        && ln -s /usr/bin/python3.6 /usr/local/bin/python3 \
-       && mkdir -p /opt/trex/$TREX_VER \
+       && mkdir -p /opt/trex \
        && mkdir /var/log/nfvbench \
-       && mkdir /tmp/trex \
-       && wget --no-cache https://github.com/cisco-system-traffic-generator/trex-core/archive/$TREX_VER.tar.gz \
-       && tar xzf $TREX_VER.tar.gz --strip-components=1 -C /tmp/trex \
+       && 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 \
-       && cp -a /tmp/trex/scripts/automation/trex_control_plane/interactive/trex /usr/local/lib/python3.6/dist-packages/ \
-       && cp -a /tmp/trex/scripts/* /opt/trex/$TREX_VER/ \
+       && 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/python3.6/dist-packages/ \
        && rm -rf /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex \
-       && rm -rf /tmp/trex \
        && wget https://bootstrap.pypa.io/get-pip.py \
-       && python3 get-pip.py \
+       && python3 get-pip.py pip==20.2.4 \
        && pip3 install -U pbr \
        && pip3 install -U setuptools \
        && cd / \
@@ -45,7 +46,7 @@ RUN apt-get update && apt-get install -y \
        && cp xtesting/testcases.yaml /usr/local/lib/python3.6/dist-packages/xtesting/ci/testcases.yaml \
        && python3 ./docker/cleanup_generators.py \
        && rm -rf /nfvbench/.git \
-       && apt-get remove -y wget git \
+       && apt-get remove -y wget git python3-dev libpython3.6-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"