Adds support for Postgres 13 (#519)

BenManwaring · Oct 11, 2020 · b192e09 · b192e09
1 parent 690030f
commit b192e09
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/postgres/generate-images b/postgres/generate-images
@@ -6,7 +6,7 @@ VARIANTS=(ram postgis postgis-ram)
 
 INCLUDE_ALPINE=false
 
-TAG_FILTER="grep -v -e ^13"
+TAG_FILTER="grep -v -e ^14"
 
 source ../shared/images/generate.sh
 

diff --git a/postgres/resources/Dockerfile-postgis.template b/postgres/resources/Dockerfile-postgis.template
@@ -1,13 +1,13 @@
 FROM {{BASE_IMAGE}}
 
 ENV PGUSER $POSTGRES_USER
-# PostGIS version for non-v12 PostgreSQL
-# v12 defaults to PostGIS v3
+# PostGIS version for versions prior to v12 PostgreSQL
+# v12 and above defaults to PostGIS v3
 ENV POSTGIS_PKG_VER 2.5
 ENV POSTGIS_VERSION 2.5.3
 
 RUN if which apt-get > /dev/null ; then \
-      if [ $PG_MAJOR = 12 ]; then \
+      if [ $PG_MAJOR -ge 12 ]; then \
 	    echo "deb http://apt.postgresql.org/pub/repos/apt/ buster-pgdg-testing main" >> /etc/apt/sources.list.d/pgdg.list && \
         apt-get update && \
         apt-get install -y --no-install-recommends \