Skip to content

Commit

Permalink
[docker-base-stretch]: Do not check expire for stretch-backports repo (
Browse files Browse the repository at this point in the history
…#3958)

* [docker-base-stretch]: Do not check expire for stretch-backports repo

Signed-off-by: Guohan Lu <gulv@microsoft.com>
  • Loading branch information
lguohan committed Jan 1, 2020
1 parent ea11287 commit 476be91
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion build_debian.sh
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT mount proc /proc -t proc

## Pointing apt to public apt mirrors and getting latest packages, needed for latest security updates
sudo cp files/apt/sources.list.$CONFIGURED_ARCH $FILESYSTEM_ROOT/etc/apt/sources.list
sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages}} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
sudo cp files/apt/apt.conf.d/{81norecommends,apt-{clean,gzip-indexes,no-languages},no-check-valid-until} $FILESYSTEM_ROOT/etc/apt/apt.conf.d/
sudo LANG=C chroot $FILESYSTEM_ROOT bash -c 'apt-mark auto `apt-mark showmanual`'

## Note: set lang to prevent locale warnings in your chroot
Expand Down
1 change: 1 addition & 0 deletions dockers/docker-base-stretch/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ COPY ["sources.list.arm64", "/etc/apt/sources.list"]
COPY ["sources.list", "/etc/apt/sources.list"]
{% endif %}
COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"]
COPY ["aptconf_archive_expired_release", "/etc/apt/apt.conf.d"]

# Update apt cache and
# pre-install fundamental packages
Expand Down
3 changes: 3 additions & 0 deletions dockers/docker-base-stretch/aptconf_archive_expired_release
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Instruct apt-get to override expired releases repo list for jessie archives

Acquire::Check-Valid-Until "0";
1 change: 1 addition & 0 deletions files/apt/apt.conf.d/no-check-valid-until
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Acquire::Check-Valid-Until "false";

0 comments on commit 476be91

Please sign in to comment.