Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[apt] Instruct apt-get to NOT check the "Valid Until" date in Release files #3973

Merged
merged 3 commits into from
Jan 7, 2020
Merged

[apt] Instruct apt-get to NOT check the "Valid Until" date in Release files #3973

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d613457
Unify names of 'no-check-valid-until' files
jleveque Jan 3, 2020
c59fa58
Instruct apt-get to ignore the 'Valid Until' date inside slave contai…
jleveque Jan 3, 2020
e33c79b
Unify 'no-check-valid-until' file contents
jleveque Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dockers/docker-base-stretch/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +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"]
COPY ["no-check-valid-until", "/etc/apt/apt.conf.d"]

# Update apt cache and
# pre-install fundamental packages
Expand Down
3 changes: 0 additions & 3 deletions dockers/docker-base-stretch/aptconf_archive_expired_release
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions dockers/docker-base-stretch/no-check-valid-until
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Instruct apt-get to NOT check the "Valid Until" date in Release files
# Once the Debian team archives a repo, they stop updating this date

Acquire::Check-Valid-Until "false";
2 changes: 1 addition & 1 deletion dockers/docker-base/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ COPY ["dpkg_01_drop", "/etc/dpkg/dpkg.cfg.d/01_drop"]
COPY ["sources.list.armhf", "/etc/apt/sources.list"]
{% elif CONFIGURED_ARCH == "arm64" %}
COPY ["sources.list.arm64", "/etc/apt/sources.list"]
COPY ["aptconf_archive_expired_release", "/etc/apt/apt.conf.d"]
COPY ["no-check-valid-until", "/etc/apt/apt.conf.d"]
{% else %}
COPY ["sources.list", "/etc/apt/sources.list"]
{% endif %}
Expand Down
3 changes: 0 additions & 3 deletions dockers/docker-base/aptconf_archive_expired_release
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions dockers/docker-base/no-check-valid-until
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Instruct apt-get to NOT check the "Valid Until" date in Release files
# Once the Debian team archives a repo, they stop updating this date

Acquire::Check-Valid-Until "false";
3 changes: 3 additions & 0 deletions files/apt/apt.conf.d/no-check-valid-until
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,4 @@
# Instruct apt-get to NOT check the "Valid Until" date in Release files
# Once the Debian team archives a repo, they stop updating this date

Acquire::Check-Valid-Until "false";
2 changes: 2 additions & 0 deletions sonic-slave-jessie/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ FROM debian:jessie

MAINTAINER johnar@microsoft.com

COPY ["no-check-valid-until", "/etc/apt/apt.conf.d/"]

## Remove retired jessie-updates repo
RUN sed -i '/http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list

Expand Down
4 changes: 4 additions & 0 deletions sonic-slave-jessie/no-check-valid-until
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Instruct apt-get to NOT check the "Valid Until" date in Release files
# Once the Debian team archives a repo, they stop updating this date

Acquire::Check-Valid-Until "false";
2 changes: 2 additions & 0 deletions sonic-slave-stretch/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ FROM debian:stretch

MAINTAINER gulv@microsoft.com

COPY ["no-check-valid-until", "/etc/apt/apt.conf.d/"]

RUN echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-free" >> /etc/apt/sources.list && \
echo "deb-src [arch=amd64] http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-free" >> /etc/apt/sources.list && \
echo "deb [arch=amd64] http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
Expand Down
4 changes: 4 additions & 0 deletions sonic-slave-stretch/no-check-valid-until
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Instruct apt-get to NOT check the "Valid Until" date in Release files
# Once the Debian team archives a repo, they stop updating this date

Acquire::Check-Valid-Until "false";