Skip to content

Commit

Permalink
[Build] Support j2 template for debian sources for docker ptf (#13198)
Browse files Browse the repository at this point in the history
Change to use the sources.list from the file generated from the j2 template
  • Loading branch information
xumia committed Dec 30, 2022
1 parent 86a5a7f commit 38c5d7f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions dockers/docker-ptf/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ WORKDIR /root

MAINTAINER Pavel Shirshov

RUN echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian buster-backports main" >> /etc/apt/sources.list
COPY ["sources.list.{{ CONFIGURED_ARCH }}", "/etc/apt/sources.list"]

## Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive

## Set the apt source, update package cache and install necessary packages
## TODO: Clean up this step
RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /etc/apt/sources.list \
&& apt-get update \
RUN apt-get update \
&& apt-get upgrade -y \
&& apt-get dist-upgrade -y \
&& apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion scripts/prepare_docker_buildinfo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ if [ -z "$DISTRO" ]; then
fi
fi

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

Expand Down

0 comments on commit 38c5d7f

Please sign in to comment.