Skip to content

Commit 444ab74

Browse files
tianontianon
authored
Merge pull request docker-library#239 from infosiftr/gnupg2
Swap from "gnupg2" to "gnupg"
2 parents 53ac4e4 + a4ce69d commit 444ab74

9 files changed

Lines changed: 21 additions & 10 deletions

File tree

‎2.7/jessie/slim/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ENV LANG C.UTF-8
1111
RUN apt-get update && apt-get install -y --no-install-recommends \
1212
ca-certificates \
1313
libgdbm3 \
14+
libreadline6 \
1415
libsqlite3-0 \
1516
libssl1.0.0 \
1617
&& rm -rf /var/lib/apt/lists/*
@@ -37,7 +38,7 @@ RUN set -ex \
3738
xz-utils \
3839
zlib1g-dev \
3940
# as of Stretch, "gpg" is no longer included by default
40-
$(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
41+
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
4142
" \
4243
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
4344
\

‎2.7/stretch/slim/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ ENV LANG C.UTF-8
1111
RUN apt-get update && apt-get install -y --no-install-recommends \
1212
ca-certificates \
1313
libgdbm3 \
14+
libreadline7 \
1415
libsqlite3-0 \
1516
libssl1.1 \
1617
&& rm -rf /var/lib/apt/lists/*
@@ -37,7 +38,7 @@ RUN set -ex \
3738
xz-utils \
3839
zlib1g-dev \
3940
# as of Stretch, "gpg" is no longer included by default
40-
$(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
41+
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
4142
" \
4243
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
4344
\

‎3.4/jessie/slim/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1919
libexpat1 \
2020
libffi6 \
2121
libgdbm3 \
22+
libreadline6 \
2223
libsqlite3-0 \
2324
libssl1.0.0 \
2425
&& rm -rf /var/lib/apt/lists/*
@@ -47,7 +48,7 @@ RUN set -ex \
4748
xz-utils \
4849
zlib1g-dev \
4950
# as of Stretch, "gpg" is no longer included by default
50-
$(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
51+
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
5152
" \
5253
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
5354
\

‎3.5/jessie/slim/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1919
libexpat1 \
2020
libffi6 \
2121
libgdbm3 \
22+
libreadline6 \
2223
libsqlite3-0 \
2324
libssl1.0.0 \
2425
&& rm -rf /var/lib/apt/lists/*
@@ -47,7 +48,7 @@ RUN set -ex \
4748
xz-utils \
4849
zlib1g-dev \
4950
# as of Stretch, "gpg" is no longer included by default
50-
$(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
51+
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
5152
" \
5253
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
5354
\

‎3.6/jessie/slim/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1919
libexpat1 \
2020
libffi6 \
2121
libgdbm3 \
22+
libreadline6 \
2223
libsqlite3-0 \
2324
libssl1.0.0 \
2425
&& rm -rf /var/lib/apt/lists/*
@@ -47,7 +48,7 @@ RUN set -ex \
4748
xz-utils \
4849
zlib1g-dev \
4950
# as of Stretch, "gpg" is no longer included by default
50-
$(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
51+
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
5152
" \
5253
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
5354
\

‎3.6/stretch/slim/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1919
libexpat1 \
2020
libffi6 \
2121
libgdbm3 \
22+
libreadline7 \
2223
libsqlite3-0 \
2324
libssl1.1 \
2425
&& rm -rf /var/lib/apt/lists/*
@@ -47,7 +48,7 @@ RUN set -ex \
4748
xz-utils \
4849
zlib1g-dev \
4950
# as of Stretch, "gpg" is no longer included by default
50-
$(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
51+
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
5152
" \
5253
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
5354
\

‎3.7-rc/stretch/slim/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1919
libexpat1 \
2020
libffi6 \
2121
libgdbm3 \
22+
libreadline7 \
2223
libsqlite3-0 \
2324
libssl1.1 \
2425
&& rm -rf /var/lib/apt/lists/*
@@ -47,7 +48,7 @@ RUN set -ex \
4748
xz-utils \
4849
zlib1g-dev \
4950
# as of Stretch, "gpg" is no longer included by default
50-
$(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
51+
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
5152
" \
5253
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
5354
\

‎Dockerfile-slim.template‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1313
libexpat1 \
1414
libffi6 \
1515
libgdbm3 \
16+
libreadline7 \
1617
libsqlite3-0 \
1718
libssl1.1 \
1819
&& rm -rf /var/lib/apt/lists/*
@@ -41,7 +42,7 @@ RUN set -ex \
4142
xz-utils \
4243
zlib1g-dev \
4344
# as of Stretch, "gpg" is no longer included by default
44-
$(command -v gpg > /dev/null || echo 'gnupg2 dirmngr') \
45+
$(command -v gpg > /dev/null || echo 'gnupg dirmngr') \
4546
" \
4647
&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
4748
\

‎update.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ for version in "${versions[@]}"; do
118118
template="Dockerfile-${template}.template"
119119

120120
if [[ "$version" == 2.* ]]; then
121-
echo " TODO: vimdiff ${versions[-1]}/$v/Dockerfile $version/$v/Dockerfile"
121+
echo " TODO: vimdiff 3.6/$v/Dockerfile $version/$v/Dockerfile"
122122
else
123123
{ generated_warning; cat "$template"; } > "$dir/Dockerfile"
124124
fi
@@ -139,7 +139,10 @@ for version in "${versions[@]}"; do
139139

140140
case "$v" in
141141
wheezy/slim|jessie/slim)
142-
sed -ri -e 's/libssl1.1/libssl1.0.0/g' "$dir/Dockerfile"
142+
sed -ri \
143+
-e 's/libssl1.1/libssl1.0.0/g' \
144+
-e 's/libreadline7/libreadline6/g' \
145+
"$dir/Dockerfile"
143146
;;
144147
esac
145148

0 commit comments

Comments
 (0)