From 20fccac6f6c3e91deb5beb7d938c950455212675 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Tue, 16 Jul 2019 12:16:56 +0200 Subject: [PATCH] Dockerfile: Use APT_MIRROR for security.debian.org as well The fastly cdn mirror we're using also mirrors the debian security repository; ``` Welcome to deb.debian.org (fastly instance)! This is deb.debian.org. This service provides mirrors for the following Debian archive repositories: /debian/ /debian-debug/ /debian-ports/ /debian-security/ The server deb.debian.org does not have packages itself, but the name has SRV records in DNS that let apt in stretch and later find places. ``` Signed-off-by: Sebastiaan van Stijn (cherry picked from commit c8f43b5f6f7c83cfb5570f7f013c7efaa430d285) Signed-off-by: Kir Kolyshkin Conflicts: * Dockerfile (GO_VERSION value differs, and CROSS (#39010) is absent) Signed-off-by: Kir Kolyshkin Upstream-commit: 6e603e957eec3a46db4d8d69c3a7946c4d2e9c59 Component: engine --- components/engine/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile index d65350f557..99b3bc49b7 100644 --- a/components/engine/Dockerfile +++ b/components/engine/Dockerfile @@ -25,9 +25,9 @@ # FROM golang:1.11.12 AS base -# allow replacing httpredir or deb mirror -ARG APT_MIRROR=deb.debian.org -RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list +ARG APT_MIRROR +RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \ + && sed -ri "s/(security).debian.org/${APT_MIRROR:-security.debian.org}/g" /etc/apt/sources.list FROM base AS criu # Install CRIU for checkpoint/restore support