From 3b022607bec233463a3d055731fb710837978747 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Wed, 1 Nov 2017 13:53:25 -0700 Subject: [PATCH] Swap from "gnupg2" to "gnupg" See https://github.com/docker-library/python/issues/236 for details. --- 10/Dockerfile | 2 +- 9.3/Dockerfile | 2 +- 9.4/Dockerfile | 2 +- 9.5/Dockerfile | 2 +- 9.6/Dockerfile | 2 +- Dockerfile-debian.template | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/10/Dockerfile b/10/Dockerfile index d62b1bc36b..908282db87 100644 --- a/10/Dockerfile +++ b/10/Dockerfile @@ -5,7 +5,7 @@ RUN set -ex; \ if ! command -v gpg > /dev/null; then \ apt-get update; \ apt-get install -y --no-install-recommends \ - gnupg2 \ + gnupg \ dirmngr \ ; \ rm -rf /var/lib/apt/lists/*; \ diff --git a/9.3/Dockerfile b/9.3/Dockerfile index c92d85410c..4768bf063d 100644 --- a/9.3/Dockerfile +++ b/9.3/Dockerfile @@ -5,7 +5,7 @@ RUN set -ex; \ if ! command -v gpg > /dev/null; then \ apt-get update; \ apt-get install -y --no-install-recommends \ - gnupg2 \ + gnupg \ dirmngr \ ; \ rm -rf /var/lib/apt/lists/*; \ diff --git a/9.4/Dockerfile b/9.4/Dockerfile index b0c9fc07de..b427e885a4 100644 --- a/9.4/Dockerfile +++ b/9.4/Dockerfile @@ -5,7 +5,7 @@ RUN set -ex; \ if ! command -v gpg > /dev/null; then \ apt-get update; \ apt-get install -y --no-install-recommends \ - gnupg2 \ + gnupg \ dirmngr \ ; \ rm -rf /var/lib/apt/lists/*; \ diff --git a/9.5/Dockerfile b/9.5/Dockerfile index 92e23bd8ca..4cb74bafa1 100644 --- a/9.5/Dockerfile +++ b/9.5/Dockerfile @@ -5,7 +5,7 @@ RUN set -ex; \ if ! command -v gpg > /dev/null; then \ apt-get update; \ apt-get install -y --no-install-recommends \ - gnupg2 \ + gnupg \ dirmngr \ ; \ rm -rf /var/lib/apt/lists/*; \ diff --git a/9.6/Dockerfile b/9.6/Dockerfile index 0d9e4c74b7..6f94be40b9 100644 --- a/9.6/Dockerfile +++ b/9.6/Dockerfile @@ -5,7 +5,7 @@ RUN set -ex; \ if ! command -v gpg > /dev/null; then \ apt-get update; \ apt-get install -y --no-install-recommends \ - gnupg2 \ + gnupg \ dirmngr \ ; \ rm -rf /var/lib/apt/lists/*; \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 115636f9e5..a66cab06c1 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -5,7 +5,7 @@ RUN set -ex; \ if ! command -v gpg > /dev/null; then \ apt-get update; \ apt-get install -y --no-install-recommends \ - gnupg2 \ + gnupg \ dirmngr \ ; \ rm -rf /var/lib/apt/lists/*; \