Rebuild image to grab latest changes from stacklight-pytest PROD-37130
Update iperf package
Change-Id: I42bc9317c988bfce8ebb23859f801d85d899e76b
diff --git a/Dockerfile b/Dockerfile
index e92f9cb..a61bf23 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,8 @@
+# syntax=docker/dockerfile:1.0.0-experimental
FROM ubuntu:20.04
LABEL maintainer="dev@mirantis.com"
-LABEL build_date="2022-08-03"
+LABEL build_date="2023-05-10"
ENV DEBIAN_FRONTEND=noninteractive \
DEBCONF_NONINTERACTIVE_SEEN=true \
@@ -12,41 +13,35 @@
USER root
ARG UBUNTU_MIRROR_URL="http://archive.ubuntu.com/ubuntu"
-ARG SL_TEST_REPO='http://gerrit.mcp.mirantis.com/mcp/stacklight-pytest'
-ARG SL_TEST_BRANCH='release/2019.2.0'
ENV PYTHONHTTPSVERIFY=0
WORKDIR /var/lib/
COPY bin/ /usr/local/bin/
COPY test_set/ ./
-
-RUN set -exo pipefail; pushd /etc/apt/ && echo > sources.list && \
+
+RUN set -exo pipefail; \
+ pushd /etc/apt/ && echo > sources.list && \
echo 'Acquire::Languages "none";' > apt.conf.d/docker-no-languages && \
echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' > apt.conf.d/docker-gzip-indexes && \
echo 'APT::Get::Install-Recommends "false"; APT::Get::Install-Suggests "false";' > apt.conf.d/docker-recommends && \
echo "deb [arch=amd64] $UBUNTU_MIRROR_URL focal main restricted universe multiverse" >> sources.list && \
echo "deb [arch=amd64] $UBUNTU_MIRROR_URL focal-updates main restricted universe multiverse" >> sources.list && \
echo "deb [arch=amd64] $UBUNTU_MIRROR_URL focal-backports main restricted universe multiverse" >> sources.list && \
- popd ; apt-get update && apt-get upgrade -y && \
+ popd ;
+RUN apt-get update && apt-get upgrade -y && \
apt-get install -y build-essential curl git-core iputils-ping libffi-dev libldap2-dev libsasl2-dev libssl-dev patch vim-tiny wget \
- virtualenv python2.7 python2.7-dev python3.8 python3.8-dev python3-pip \
+ python2.7 python2.7-dev python3.8 python3.8-dev python3-pip \
# Due to upstream bug we should use fixed version of pip
&& pip3 install -U pip==20.0.2 \
- && pip3 install tox \
+ && pip3 install tox==3.25.1 virtualenv==20.21.0
# initialize cvp stacklight test suite
- && mkdir cvp-stacklight \
- && pushd cvp-stacklight \
- && git clone -b $SL_TEST_BRANCH $SL_TEST_REPO \
- && pushd stacklight-pytest \
- && git log -n1 \
- && popd && popd \
- && tox --recreate \
+RUN tox --recreate \
# Cleanup
&& apt-get -y purge libx11-data xauth libxmuu1 libxcb1 libx11-6 libxext6 ppp pppconfig pppoeconf popularity-contest cpp gcc g++ libssl-doc && \
apt-get -y autoremove; apt-get -y clean ; rm -rf /root/.cache; rm -rf /var/lib/apt/lists/* && \
rm -rf /tmp/* ; rm -rf /var/tmp/* ; rm -rfv /etc/apt/sources.list.d/* ; echo > /etc/apt/sources.list \
# Download iperf package
- && wget http://ftp.br.debian.org/debian/pool/main/i/iperf/iperf_2.0.5+dfsg1-2_amd64.deb -O /var/lib/iperf_2.0.5+dfsg1-2_amd64.deb
+ && wget http://ftp.br.debian.org/debian/pool/main/i/iperf/iperf_2.0.14a+dfsg1-1_amd64.deb -O /var/lib/iperf.deb
ENTRYPOINT ["entrypoint.sh"]
# docker build --no-cache -t cvp-sanity-checks:test_latest .