Skip to content

Commit 7558f8a

Browse files
committed
Swap from "gnupg2" to "gnupg"
See docker-library#236 for details.
1 parent 53ac4e4 commit 7558f8a

8 files changed

Lines changed: 8 additions & 8 deletions

File tree

2.7/jessie/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN set -ex \
3737
xz-utils \
3838
zlib1g-dev \
3939
# 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') \
4141
" \
4242
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
4343
\

2.7/stretch/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN set -ex \
3737
xz-utils \
3838
zlib1g-dev \
3939
# 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') \
4141
" \
4242
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
4343
\

3.4/jessie/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ RUN set -ex \
4747
xz-utils \
4848
zlib1g-dev \
4949
# 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') \
5151
" \
5252
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
5353
\

3.5/jessie/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ RUN set -ex \
4747
xz-utils \
4848
zlib1g-dev \
4949
# 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') \
5151
" \
5252
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
5353
\

3.6/jessie/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ RUN set -ex \
4747
xz-utils \
4848
zlib1g-dev \
4949
# 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') \
5151
" \
5252
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
5353
\

3.6/stretch/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ RUN set -ex \
4747
xz-utils \
4848
zlib1g-dev \
4949
# 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') \
5151
" \
5252
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
5353
\

3.7-rc/stretch/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ RUN set -ex \
4747
xz-utils \
4848
zlib1g-dev \
4949
# 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') \
5151
" \
5252
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
5353
\

Dockerfile-slim.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ RUN set -ex \
4141
xz-utils \
4242
zlib1g-dev \
4343
# 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') \
4545
" \
4646
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
4747
\

0 commit comments

Comments
 (0)