Skip to content

Commit b3433b4

Browse files
committed
[Build] Support j2 template for debian sources for docker ptf (sonic-net#13198)
Change to use the sources.list from the file generated from the j2 template
1 parent 179b67e commit b3433b4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

dockers/docker-ptf/Dockerfile.j2

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ FROM {{ prefix }}debian:buster
99

1010
MAINTAINER Pavel Shirshov
1111

12-
RUN echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian buster-backports main" >> /etc/apt/sources.list
12+
COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]
13+
1314
## Make apt-get non-interactive
1415
ENV DEBIAN_FRONTEND=noninteractive
1516

1617
## Set the apt source, update package cache and install necessary packages
1718
## TODO: Clean up this step
18-
RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /etc/apt/sources.list \
19-
&& apt-get update \
19+
RUN apt-get update \
2020
&& apt-get upgrade -y \
2121
&& apt-get dist-upgrade -y \
2222
&& apt-get install -y \

scripts/prepare_docker_buildinfo.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if [ -z "$DISTRO" ]; then
2222
[ -z "$DISTRO" ] && DISTRO=jessie
2323
fi
2424

25-
if [[ "$IMAGENAME" == docker-base-* ]]; then
25+
if [[ "$IMAGENAME" == docker-base-* ]] || [[ "$IMAGENAME" == docker-ptf ]]; then
2626
scripts/build_mirror_config.sh ${DOCKERFILE_PATH} $ARCH $DISTRO
2727
fi
2828

0 commit comments

Comments
 (0)