Add explicit libreadline dependency now that we don't accidentally keep "gnupg" (which was pulling it in transitively)

tianon · tianon · commit a4ce69de0533 · 2017-11-01T20:20:43.000-07:00
diff --git a/2.7/jessie/slim/Dockerfile b/2.7/jessie/slim/Dockerfile
@@ -11,6 +11,7 @@ ENV LANG C.UTF-8
 RUN apt-get update && apt-get install -y --no-install-recommends \
 		ca-certificates \
 		libgdbm3 \
+		libreadline6 \
 		libsqlite3-0 \
 		libssl1.0.0 \
 	&& rm -rf /var/lib/apt/lists/*
diff --git a/2.7/stretch/slim/Dockerfile b/2.7/stretch/slim/Dockerfile
@@ -11,6 +11,7 @@ ENV LANG C.UTF-8
 RUN apt-get update && apt-get install -y --no-install-recommends \
 		ca-certificates \
 		libgdbm3 \
+		libreadline7 \
 		libsqlite3-0 \
 		libssl1.1 \
 	&& rm -rf /var/lib/apt/lists/*
diff --git a/3.4/jessie/slim/Dockerfile b/3.4/jessie/slim/Dockerfile
@@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		libexpat1 \
 		libffi6 \
 		libgdbm3 \
+		libreadline6 \
 		libsqlite3-0 \
 		libssl1.0.0 \
 	&& rm -rf /var/lib/apt/lists/*
diff --git a/3.5/jessie/slim/Dockerfile b/3.5/jessie/slim/Dockerfile
@@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		libexpat1 \
 		libffi6 \
 		libgdbm3 \
+		libreadline6 \
 		libsqlite3-0 \
 		libssl1.0.0 \
 	&& rm -rf /var/lib/apt/lists/*
diff --git a/3.6/jessie/slim/Dockerfile b/3.6/jessie/slim/Dockerfile
@@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		libexpat1 \
 		libffi6 \
 		libgdbm3 \
+		libreadline6 \
 		libsqlite3-0 \
 		libssl1.0.0 \
 	&& rm -rf /var/lib/apt/lists/*
diff --git a/3.6/stretch/slim/Dockerfile b/3.6/stretch/slim/Dockerfile
@@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		libexpat1 \
 		libffi6 \
 		libgdbm3 \
+		libreadline7 \
 		libsqlite3-0 \
 		libssl1.1 \
 	&& rm -rf /var/lib/apt/lists/*
diff --git a/3.7-rc/stretch/slim/Dockerfile b/3.7-rc/stretch/slim/Dockerfile
@@ -19,6 +19,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		libexpat1 \
 		libffi6 \
 		libgdbm3 \
+		libreadline7 \
 		libsqlite3-0 \
 		libssl1.1 \
 	&& rm -rf /var/lib/apt/lists/*
diff --git a/Dockerfile-slim.template b/Dockerfile-slim.template
@@ -13,6 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 		libexpat1 \
 		libffi6 \
 		libgdbm3 \
+		libreadline7 \
 		libsqlite3-0 \
 		libssl1.1 \
 	&& rm -rf /var/lib/apt/lists/*
diff --git a/update.sh b/update.sh
@@ -118,7 +118,7 @@ for version in "${versions[@]}"; do
 		template="Dockerfile-${template}.template"
 
 		if [[ "$version" == 2.* ]]; then
-			echo "  TODO: vimdiff ${versions[-1]}/$v/Dockerfile $version/$v/Dockerfile"
+			echo "  TODO: vimdiff 3.6/$v/Dockerfile $version/$v/Dockerfile"
 		else
 			{ generated_warning; cat "$template"; } > "$dir/Dockerfile"
 		fi
@@ -139,7 +139,10 @@ for version in "${versions[@]}"; do
 
 		case "$v" in
 			wheezy/slim|jessie/slim)
-				sed -ri -e 's/libssl1.1/libssl1.0.0/g' "$dir/Dockerfile"
+				sed -ri \
+					-e 's/libssl1.1/libssl1.0.0/g' \
+					-e 's/libreadline7/libreadline6/g' \
+					"$dir/Dockerfile"
 				;;
 		esac
 
