File tree 2 files changed +3
-19
lines changed
2 files changed +3
-19
lines changed Original file line number Diff line number Diff line change @@ -3,21 +3,12 @@ FROM multiarch/debian-debootstrap:armhf-stretch
3
3
{% elif CONFIGURED_ARCH == "arm64" and MULTIARCH_QEMU_ENVIRON == "y" %}
4
4
FROM multiarch/debian-debootstrap:arm64-stretch
5
5
{% else %}
6
- FROM debian:stretch
6
+ FROM debian:buster
7
7
{% endif %}
8
8
9
9
MAINTAINER Pavel Shirshov
10
10
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
21
12
## Make apt-get non-interactive
22
13
ENV DEBIAN_FRONTEND=noninteractive
23
14
@@ -47,7 +38,7 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
47
38
cmake \
48
39
libqt5core5a \
49
40
libqt5network5 \
50
- libboost-atomic1.62 .0 \
41
+ libboost-atomic1.71 .0 \
51
42
less \
52
43
git \
53
44
iputils-ping \
@@ -68,12 +59,6 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
68
59
bridge-utils \
69
60
libteam-utils
70
61
71
-
72
- RUN dpkg -i \
73
- {% for deb in docker_ptf_debs .split (' ' ) -%}
74
- debs/{{ deb }}{{' '}}
75
- {% - endfor %}
76
-
77
62
# Install all python modules from pypi. python-scapy is exception, ptf debian package requires python-scapy
78
63
# TODO: Clean up this step
79
64
RUN rm -rf /debs \
Original file line number Diff line number Diff line change @@ -4,4 +4,3 @@ DOCKER_PTF = docker-ptf.gz
4
4
$(DOCKER_PTF)_PATH = $(DOCKERS_PATH ) /docker-ptf
5
5
$(DOCKER_PTF)_DEPENDS += $(LIBTHRIFT ) $(PYTHON_THRIFT ) $(PTF ) $(PYTHON_SAITHRIFT )
6
6
SONIC_DOCKER_IMAGES += $(DOCKER_PTF )
7
- SONIC_STRETCH_DOCKERS += $(DOCKER_PTF )
You can’t perform that action at this time.
0 commit comments