Skip to content

Commit 472df2b

Browse files
committed
[Build] Support j2 template for debian sources for docker ptf
1 parent 8786f57 commit 472df2b

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

dockers/docker-ptf/Dockerfile.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ WORKDIR /root
1414

1515
MAINTAINER Pavel Shirshov
1616

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

2122
## Set the apt source, update package cache and install necessary packages
2223
## TODO: Clean up this step
23-
RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /etc/apt/sources.list \
24-
&& apt-get update \
24+
RUN apt-get update \
2525
&& apt-get upgrade -y \
2626
&& apt-get dist-upgrade -y \
2727
&& apt-get install -y \

scripts/prepare_docker_buildinfo.sh

Lines changed: 1 addition & 1 deletion
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)