Swap from "gnupg2" to "gnupg"

tianon · tianon · commit 7558f8a0fbd5 · 2017-11-01T13:54:01.000-07:00
See docker-library#236 for details.
diff --git a/2.7/jessie/slim/Dockerfile b/2.7/jessie/slim/Dockerfile
@@ -37,7 +37,7 @@ RUN set -ex \
 		xz-utils \
 		zlib1g-dev \
 # as of Stretch, "gpg" is no longer included by default
-		$(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
+		$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
 	" \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	\
diff --git a/2.7/stretch/slim/Dockerfile b/2.7/stretch/slim/Dockerfile
@@ -37,7 +37,7 @@ RUN set -ex \
 		xz-utils \
 		zlib1g-dev \
 # as of Stretch, "gpg" is no longer included by default
-		$(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
+		$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
 	" \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	\
diff --git a/3.4/jessie/slim/Dockerfile b/3.4/jessie/slim/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex \
 		xz-utils \
 		zlib1g-dev \
 # as of Stretch, "gpg" is no longer included by default
-		$(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
+		$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
 	" \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	\
diff --git a/3.5/jessie/slim/Dockerfile b/3.5/jessie/slim/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex \
 		xz-utils \
 		zlib1g-dev \
 # as of Stretch, "gpg" is no longer included by default
-		$(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
+		$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
 	" \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	\
diff --git a/3.6/jessie/slim/Dockerfile b/3.6/jessie/slim/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex \
 		xz-utils \
 		zlib1g-dev \
 # as of Stretch, "gpg" is no longer included by default
-		$(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
+		$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
 	" \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	\
diff --git a/3.6/stretch/slim/Dockerfile b/3.6/stretch/slim/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex \
 		xz-utils \
 		zlib1g-dev \
 # as of Stretch, "gpg" is no longer included by default
-		$(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
+		$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
 	" \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	\
diff --git a/3.7-rc/stretch/slim/Dockerfile b/3.7-rc/stretch/slim/Dockerfile
@@ -47,7 +47,7 @@ RUN set -ex \
 		xz-utils \
 		zlib1g-dev \
 # as of Stretch, "gpg" is no longer included by default
-		$(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
+		$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
 	" \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	\
diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
@@ -41,7 +41,7 @@ RUN set -ex \
 		xz-utils \
 		zlib1g-dev \
 # as of Stretch, "gpg" is no longer included by default
-		$(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
+		$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
 	" \
 	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	\

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ RUN set -ex \`
`37`	`37`	`xz-utils \`
`38`	`38`	`zlib1g-dev \`
`39`	`39`	`# as of Stretch, "gpg" is no longer included by default`
`40`		`- $(command -v gpg > /dev/null \|\| echo 'gnupg2 dirmngr') \`
	`40`	`+ $(command -v gpg > /dev/null \|\| echo 'gnupg dirmngr') \`
`41`	`41`	`" \`
`42`	`42`	`&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \`
`43`	`43`	`\`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ RUN set -ex \`
`47`	`47`	`xz-utils \`
`48`	`48`	`zlib1g-dev \`
`49`	`49`	`# as of Stretch, "gpg" is no longer included by default`
`50`		`- $(command -v gpg > /dev/null \|\| echo 'gnupg2 dirmngr') \`
	`50`	`+ $(command -v gpg > /dev/null \|\| echo 'gnupg dirmngr') \`
`51`	`51`	`" \`
`52`	`52`	`&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \`
`53`	`53`	`\`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ RUN set -ex \`
`41`	`41`	`xz-utils \`
`42`	`42`	`zlib1g-dev \`
`43`	`43`	`# as of Stretch, "gpg" is no longer included by default`
`44`		`- $(command -v gpg > /dev/null \|\| echo 'gnupg2 dirmngr') \`
	`44`	`+ $(command -v gpg > /dev/null \|\| echo 'gnupg dirmngr') \`
`45`	`45`	`" \`
`46`	`46`	`&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \`
`47`	`47`	`\`