Merge pull request #1027 from infosiftr/stretch-pinning

Properly pin all buster dists in stretch-based images

Author: yosifkit

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; \
 ##</argon2-stretch>##

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; \
 ##</argon2-stretch>##

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; \
 ##</argon2-stretch>##

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; \
 ##</argon2-stretch>##

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; \
 ##</argon2-stretch>##

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; \
 ##</argon2-stretch>##

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; \
 ##</argon2-stretch>##

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; \
 ##</argon2-stretch>##

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; \
 ##</argon2-stretch>##