[Build] Support j2 template for debian sources for docker ptf (#13198)
Change to use the sources.list from the file generated from the j2 template
This commit is contained in:
parent
7fc672c3e8
commit
81dd4b8f7b
@ -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 \
|
||||
|
@ -22,7 +22,7 @@ if [ -z "$DISTRO" ]; then
|
||||
[ -z "$DISTRO" ] && DISTRO=jessie
|
||||
fi
|
||||
|
||||
if [[ "$IMAGENAME" == docker-base-* ]]; then
|
||||
if [[ "$IMAGENAME" == docker-base-* ]] || [[ "$IMAGENAME" == docker-ptf ]]; then
|
||||
scripts/build_mirror_config.sh ${DOCKERFILE_PATH} $ARCH $DISTRO
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user