Merge pull request docker-library#364 from infosiftr/gnupg2

tianon · web-flow · commit 4566cb036dd0 · 2017-11-01T15:50:34.000-07:00
Swap from "gnupg2" to "gnupg"
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/*; \
