Code Review
/
nfvbench.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update loop VM image to v0.14
[nfvbench.git]
/
docker
/
Dockerfile
diff --git
a/docker/Dockerfile
b/docker/Dockerfile
index
8dc1e2f
..
4336261
100644
(file)
--- a/
docker/Dockerfile
+++ b/
docker/Dockerfile
@@
-1,54
+1,55
@@
# docker file for creating a container that has nfvbench installed and ready to use
# 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.
7
9"
-ENV VM_IMAGE_VER "0.1
2
"
+ENV TREX_VER "v2.
8
9"
+ENV VM_IMAGE_VER "0.1
4
"
ENV PYTHONIOENCODING "utf8"
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 \
RUN apt-get update && apt-get install -y \
git \
kmod \
pciutils \
- python3.
6
\
+ python3.
8
\
vim \
wget \
net-tools \
iproute2 \
libelf1 \
vim \
wget \
net-tools \
iproute2 \
libelf1 \
- && ln -s /usr/bin/python3.6 /usr/local/bin/python3 \
- && mkdir -p /opt/trex/$TREX_VER \
+ 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 \
&& 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 \
&& 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.8/dist-packages
/ \
&& rm -rf /opt/trex/$TREX_VER/automation/trex_control_plane/interactive/trex \
&& 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 \
&& pip3 install -U pbr \
&& pip3 install -U setuptools \
&& wget https://bootstrap.pypa.io/get-pip.py \
&& python3 get-pip.py \
&& pip3 install -U pbr \
&& pip3 install -U setuptools \
- && cd / \
+ && 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 \
&& git clone https://gerrit.opnfv.org/gerrit/nfvbench \
- && cd
/
nfvbench && pip3 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 \
# Override Xtesting testcases.yaml file by NFVbench default one
&& wget -O nfvbenchvm-$VM_IMAGE_VER.qcow2 http://artifacts.opnfv.org/nfvbench/images/nfvbenchvm_centos-$VM_IMAGE_VER.qcow2 \
# Override Xtesting testcases.yaml file by NFVbench default one
- && cp xtesting/testcases.yaml /usr/local/lib/python3.6/dist-packages/xtesting/ci/testcases.yaml \
+ && 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 \
&& python3 ./docker/cleanup_generators.py \
- && rm -rf /nfvbench/.git \
- && apt-get remove -y wget git \
+ && 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"
&& 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"]