Remove postgresql-contrib-10 since it does not exist

yosifkit · yosifkit · commit 010a4e7e8321 · 2017-06-22T11:24:36.000-07:00
diff --git a/10/Dockerfile b/10/Dockerfile
@@ -56,7 +56,6 @@ RUN apt-get update \
 	&& sed -ri 's/#(create_main_cluster) .*$/\1 = false/' /etc/postgresql-common/createcluster.conf \
 	&& apt-get install -y \
 		postgresql-$PG_MAJOR=$PG_VERSION \
-		postgresql-contrib-$PG_MAJOR=$PG_VERSION \
 	&& rm -rf /var/lib/apt/lists/*
 
 # make the sample config easier to munge (and "correct by default")
diff --git a/update.sh b/update.sh
@@ -48,6 +48,13 @@ for version in "${versions[@]}"; do
 			-e 's/%%PG_VERSION%%/'"$fullVersion"'/g' \
 			-e 's/%%DEBIAN_SUITE%%/'"${debianSuite[$version]}"'/g' \
 			Dockerfile-debian.template > "$version/Dockerfile"
+		if [ "$version" = '10' ]; then
+			# postgresql-contrib-10 package does not exist, but is provided by postgresql-10
+			# Packages.gz:
+			# Package: postgresql-10
+			# Provides: postgresql-contrib-10
+			sed -i -e '/postgresql-contrib-/d' "$version/Dockerfile"
+		fi
 	)
 
 	# TODO figure out what to do with odd version numbers here, like release candidates
