[docker-ptf] Upgrade to buster (#8254)

Co-authored-by: Your Name <you@example.com>
This commit is contained in:
Myron Sosyak 2021-08-18 10:42:03 -07:00 committed by GitHub
parent 3f095f1699
commit 4d03526311
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 19 deletions

View File

@ -3,21 +3,12 @@ FROM multiarch/debian-debootstrap:armhf-stretch
{% elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %} {% elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
FROM multiarch/debian-debootstrap:arm64-stretch FROM multiarch/debian-debootstrap:arm64-stretch
{% else %} {% else %}
FROM debian:stretch FROM debian:buster
{% endif %} {% endif %}
MAINTAINER Pavel Shirshov MAINTAINER Pavel Shirshov
## Remove retired jessie-updates repo RUN echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian buster-backports main" >> /etc/apt/sources.list
RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
## Copy dependencies
COPY \
{% for deb in docker_ptf_debs.split(' ') -%}
debs/{{ deb }}{{' '}}
{%- endfor -%}
debs/
## Make apt-get non-interactive ## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
@ -47,7 +38,7 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
cmake \ cmake \
libqt5core5a \ libqt5core5a \
libqt5network5 \ libqt5network5 \
libboost-atomic1.62.0 \ libboost-atomic1.71.0 \
less \ less \
git \ git \
iputils-ping \ iputils-ping \
@ -68,12 +59,6 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
bridge-utils \ bridge-utils \
libteam-utils libteam-utils
RUN dpkg -i \
{% for deb in docker_ptf_debs.split(' ') -%}
debs/{{ deb }}{{' '}}
{%- endfor %}
# Install all python modules from pypi. python-scapy is exception, ptf debian package requires python-scapy # Install all python modules from pypi. python-scapy is exception, ptf debian package requires python-scapy
# TODO: Clean up this step # TODO: Clean up this step
RUN rm -rf /debs \ RUN rm -rf /debs \

View File

@ -4,4 +4,3 @@ DOCKER_PTF = docker-ptf.gz
$(DOCKER_PTF)_PATH = $(DOCKERS_PATH)/docker-ptf $(DOCKER_PTF)_PATH = $(DOCKERS_PATH)/docker-ptf
$(DOCKER_PTF)_DEPENDS += $(LIBTHRIFT) $(PYTHON_THRIFT) $(PTF) $(PYTHON_SAITHRIFT) $(DOCKER_PTF)_DEPENDS += $(LIBTHRIFT) $(PYTHON_THRIFT) $(PTF) $(PYTHON_SAITHRIFT)
SONIC_DOCKER_IMAGES += $(DOCKER_PTF) SONIC_DOCKER_IMAGES += $(DOCKER_PTF)
SONIC_STRETCH_DOCKERS += $(DOCKER_PTF)