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

Jump to bottom

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

Closed
wants to merge 5 commits into from
Closed

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0c1375d
[dockers] Instruct apt-get to NOT check the "Valid Until" date in Rel…
jleveque Feb 27, 2019
7a37f8a
Apply same change to sonic-slave Docker image
jleveque Feb 27, 2019
022563e
Apply same change to sonic-slave-stretch Docker image
jleveque Feb 27, 2019
aa4ec63
Apply same change to base image
jleveque Feb 27, 2019
2bb8447
Apply same change to installer image
jleveque Feb 27, 2019
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 @@ -20,7 +20,7 @@ ENV DEBIAN_FRONTEND=noninteractive
# Configure data sources for apt/dpkg
COPY ["dpkg_01_drop", "/etc/dpkg/dpkg.cfg.d/01_drop"]
COPY ["sources.list", "/etc/apt/sources.list"]
COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"]
COPY ["no-check-valid-until", "no-install-recommend-suggest", "/etc/apt/apt.conf.d/"]
RUN apt-get update

# Pre-install fundamental packages
Expand Down
3 changes: 3 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,3 @@
# Instruct apt-get to NOT check the "Valid Until" date in Release files

Acquire::Check-Valid-Until "0";
0 ...base-stretch/no_install_recommend_suggest → ...base-stretch/no-install-recommend-suggest
View file
Open in desktop
File renamed without changes.
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 @@ -20,7 +20,7 @@ ENV DEBIAN_FRONTEND=noninteractive
# Configure data sources for apt/dpkg
COPY ["dpkg_01_drop", "/etc/dpkg/dpkg.cfg.d/01_drop"]
COPY ["sources.list", "/etc/apt/sources.list"]
COPY ["no_install_recommend_suggest", "/etc/apt/apt.conf.d"]
COPY ["no-check-valid-until", "no-install-recommend-suggest", "/etc/apt/apt.conf.d/"]
RUN apt-get update

# Pre-install fundamental packages
Expand Down
3 changes: 3 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,3 @@
# Instruct apt-get to NOT check the "Valid Until" date in Release files

Acquire::Check-Valid-Until "0";
0 .../docker-base/no_install_recommend_suggest → .../docker-base/no-install-recommend-suggest
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions sonic-slave-stretch/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ FROM debian:stretch

MAINTAINER gulv@microsoft.com

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

RUN echo "deb http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-free" >> /etc/apt/sources.list && \
echo "deb-src http://debian-archive.trafficmanager.net/debian/ stretch main contrib non-free" >> /etc/apt/sources.list && \
echo "deb http://debian-archive.trafficmanager.net/debian-security/ stretch/updates main contrib non-free" >> /etc/apt/sources.list && \
Expand Down
3 changes: 3 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,3 @@
# Instruct apt-get to NOT check the "Valid Until" date in Release files

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

MAINTAINER johnar@microsoft.com

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

RUN echo "deb http://debian-archive.trafficmanager.net/debian/ jessie main contrib non-free" >> /etc/apt/sources.list && \
echo "deb-src http://debian-archive.trafficmanager.net/debian/ jessie main contrib non-free" >> /etc/apt/sources.list && \
echo "deb http://debian-archive.trafficmanager.net/debian-security/ jessie/updates main contrib non-free" >> /etc/apt/sources.list && \
Expand Down
3 changes: 3 additions & 0 deletions sonic-slave/no-check-valid-until
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Instruct apt-get to NOT check the "Valid Until" date in Release files

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