From 1daa5daf973d3bbd3e18e14ecdf88b791bc0a89e Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Mon, 22 Jun 2020 11:00:40 -0700 Subject: [PATCH] Properly pin all buster dists in stretch-based images --- 7.2/stretch/apache/Dockerfile | 4 ++-- 7.2/stretch/cli/Dockerfile | 4 ++-- 7.2/stretch/fpm/Dockerfile | 4 ++-- 7.2/stretch/zts/Dockerfile | 4 ++-- 7.3/stretch/apache/Dockerfile | 4 ++-- 7.3/stretch/cli/Dockerfile | 4 ++-- 7.3/stretch/fpm/Dockerfile | 4 ++-- 7.3/stretch/zts/Dockerfile | 4 ++-- Dockerfile-debian.template | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/7.2/stretch/apache/Dockerfile b/7.2/stretch/apache/Dockerfile index b45a2d4a0e..71b4a35a22 100644 --- a/7.2/stretch/apache/Dockerfile +++ b/7.2/stretch/apache/Dockerfile @@ -170,11 +170,11 @@ RUN set -eux; \ sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \ { \ echo 'Package: *'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: -10'; \ echo; \ echo 'Package: libargon2*'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: 990'; \ } > /etc/apt/preferences.d/argon2-buster; \ #### diff --git a/7.2/stretch/cli/Dockerfile b/7.2/stretch/cli/Dockerfile index a6c2fb1ae0..fb3eabf790 100644 --- a/7.2/stretch/cli/Dockerfile +++ b/7.2/stretch/cli/Dockerfile @@ -110,11 +110,11 @@ RUN set -eux; \ sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \ { \ echo 'Package: *'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: -10'; \ echo; \ echo 'Package: libargon2*'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: 990'; \ } > /etc/apt/preferences.d/argon2-buster; \ #### diff --git a/7.2/stretch/fpm/Dockerfile b/7.2/stretch/fpm/Dockerfile index a9a77e2f75..cbe8bbd447 100644 --- a/7.2/stretch/fpm/Dockerfile +++ b/7.2/stretch/fpm/Dockerfile @@ -111,11 +111,11 @@ RUN set -eux; \ sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \ { \ echo 'Package: *'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: -10'; \ echo; \ echo 'Package: libargon2*'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: 990'; \ } > /etc/apt/preferences.d/argon2-buster; \ #### diff --git a/7.2/stretch/zts/Dockerfile b/7.2/stretch/zts/Dockerfile index 39c1651a50..afb22cf9b5 100644 --- a/7.2/stretch/zts/Dockerfile +++ b/7.2/stretch/zts/Dockerfile @@ -111,11 +111,11 @@ RUN set -eux; \ sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \ { \ echo 'Package: *'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: -10'; \ echo; \ echo 'Package: libargon2*'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: 990'; \ } > /etc/apt/preferences.d/argon2-buster; \ #### diff --git a/7.3/stretch/apache/Dockerfile b/7.3/stretch/apache/Dockerfile index cdeb04b053..ff6d80fffe 100644 --- a/7.3/stretch/apache/Dockerfile +++ b/7.3/stretch/apache/Dockerfile @@ -170,11 +170,11 @@ RUN set -eux; \ sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \ { \ echo 'Package: *'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: -10'; \ echo; \ echo 'Package: libargon2*'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: 990'; \ } > /etc/apt/preferences.d/argon2-buster; \ #### diff --git a/7.3/stretch/cli/Dockerfile b/7.3/stretch/cli/Dockerfile index 914c077acf..a2a6970d85 100644 --- a/7.3/stretch/cli/Dockerfile +++ b/7.3/stretch/cli/Dockerfile @@ -110,11 +110,11 @@ RUN set -eux; \ sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \ { \ echo 'Package: *'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: -10'; \ echo; \ echo 'Package: libargon2*'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: 990'; \ } > /etc/apt/preferences.d/argon2-buster; \ #### diff --git a/7.3/stretch/fpm/Dockerfile b/7.3/stretch/fpm/Dockerfile index 603fde3de3..a5e8b17443 100644 --- a/7.3/stretch/fpm/Dockerfile +++ b/7.3/stretch/fpm/Dockerfile @@ -111,11 +111,11 @@ RUN set -eux; \ sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \ { \ echo 'Package: *'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: -10'; \ echo; \ echo 'Package: libargon2*'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: 990'; \ } > /etc/apt/preferences.d/argon2-buster; \ #### diff --git a/7.3/stretch/zts/Dockerfile b/7.3/stretch/zts/Dockerfile index efd90b5f49..394ea25c05 100644 --- a/7.3/stretch/zts/Dockerfile +++ b/7.3/stretch/zts/Dockerfile @@ -111,11 +111,11 @@ RUN set -eux; \ sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \ { \ echo 'Package: *'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: -10'; \ echo; \ echo 'Package: libargon2*'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: 990'; \ } > /etc/apt/preferences.d/argon2-buster; \ #### diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 4e0acf4faa..cfaeb9df76 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -104,11 +104,11 @@ RUN set -eux; \ sed -e 's/stretch/buster/g' /etc/apt/sources.list > /etc/apt/sources.list.d/buster.list; \ { \ echo 'Package: *'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: -10'; \ echo; \ echo 'Package: libargon2*'; \ - echo 'Pin: release n=buster'; \ + echo 'Pin: release n=buster*'; \ echo 'Pin-Priority: 990'; \ } > /etc/apt/preferences.d/argon2-buster; \ ####