From 010a4e7e8321a692cd2fdb41c87cb8d4023567aa Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Thu, 22 Jun 2017 11:24:36 -0700 Subject: [PATCH] Remove postgresql-contrib-10 since it does not exist --- 10/Dockerfile | 1 - update.sh | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/10/Dockerfile b/10/Dockerfile index c6191ef0a8..24844141cd 100644 --- 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 index 6aee7991ea..efb6b1b267 100755 --- 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