Skip to content

Commit 4d03526

Browse files
Myron SosyakYour Name
Myron Sosyak
and
Your Name
authored
[docker-ptf] Upgrade to buster (#8254)
Co-authored-by: Your Name <[email protected]>
1 parent 3f095f1 commit 4d03526

File tree

2 files changed

+3
-19
lines changed

2 files changed

+3
-19
lines changed

dockers/docker-ptf/Dockerfile.j2

+3-18
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,12 @@ FROM multiarch/debian-debootstrap:armhf-stretch
33
{% elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
44
FROM multiarch/debian-debootstrap:arm64-stretch
55
{% else %}
6-
FROM debian:stretch
6+
FROM debian:buster
77
{% endif %}
88

99
MAINTAINER Pavel Shirshov
1010

11-
## Remove retired jessie-updates repo
12-
RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list
13-
14-
## Copy dependencies
15-
COPY \
16-
{% for deb in docker_ptf_debs.split(' ') -%}
17-
debs/{{ deb }}{{' '}}
18-
{%- endfor -%}
19-
debs/
20-
11+
RUN echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian buster-backports main" >> /etc/apt/sources.list
2112
## Make apt-get non-interactive
2213
ENV DEBIAN_FRONTEND=noninteractive
2314

@@ -47,7 +38,7 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
4738
cmake \
4839
libqt5core5a \
4940
libqt5network5 \
50-
libboost-atomic1.62.0 \
41+
libboost-atomic1.71.0 \
5142
less \
5243
git \
5344
iputils-ping \
@@ -68,12 +59,6 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
6859
bridge-utils \
6960
libteam-utils
7061

71-
72-
RUN dpkg -i \
73-
{% for deb in docker_ptf_debs.split(' ') -%}
74-
debs/{{ deb }}{{' '}}
75-
{%- endfor %}
76-
7762
# Install all python modules from pypi. python-scapy is exception, ptf debian package requires python-scapy
7863
# TODO: Clean up this step
7964
RUN rm -rf /debs \

platform/vs/docker-ptf.mk

-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ DOCKER_PTF = docker-ptf.gz
44
$(DOCKER_PTF)_PATH = $(DOCKERS_PATH)/docker-ptf
55
$(DOCKER_PTF)_DEPENDS += $(LIBTHRIFT) $(PYTHON_THRIFT) $(PTF) $(PYTHON_SAITHRIFT)
66
SONIC_DOCKER_IMAGES += $(DOCKER_PTF)
7-
SONIC_STRETCH_DOCKERS += $(DOCKER_PTF)

0 commit comments

Comments
 (0)