summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorfmenguy <francoisregis.menguy@orange.com>2019-02-20 11:50:01 +0100
committerfmenguy <francoisregis.menguy@orange.com>2019-02-28 14:40:55 +0100
commite1887dcf96c21e96f259a94f5e6835d45b27dfdf (patch)
tree56d23924684100324fa0a4f8700d2aa1a5a2bf5d /docker
parent7d83fb2596b3128ba47a7ac1e263e6926a0befd3 (diff)
NFVBENCH-124 Upgrade TRex to v2.533.1.0
Change-Id: I7781d7a76ec06162c56112e592a43bb5060ef8b1 Signed-off-by: fmenguy <francoisregis.menguy@orange.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/Dockerfile9
1 files changed, 5 insertions, 4 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index cd59fa0..1980575 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
# docker file for creating a container that has nfvbench installed and ready to use
FROM ubuntu:16.04
-ENV TREX_VER "v2.32"
+ENV TREX_VER "v2.53"
ENV VM_IMAGE_VER "0.6"
RUN apt-get update && apt-get install -y \
@@ -21,8 +21,8 @@ RUN apt-get update && apt-get install -y \
&& 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 \
+ && 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 \
&& pip install -U pip pbr \
&& hash -r pip \
@@ -36,6 +36,7 @@ RUN apt-get update && apt-get install -y \
&& apt-get remove -y wget git \
&& 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"]