WarpSQL: Add PostGIS extension smoke tests

1. Add smoke tests to the GitHub Actions workflow to verify the functionality of the PostGIS extension.
2. This includes creating the PostGIS extension, checking its version, and testing basic geometry functions.

Author: jayanth-kumar-morem

.github/workflows/smoke-test.yml

@@ -62,6 +62,15 @@ jobs:
               psql -c "INSERT INTO test_distributed_table (data) VALUES ('test data');"
               psql -c "SELECT * FROM test_distributed_table;"
 
+              echo "Test PostGIS Extension"
+              psql -c "CREATE EXTENSION postgis;" || true
+              psql -c "SELECT PostGIS_Version();"
+
+              echo "Test PostGIS Geometry Function"
+              psql -c "CREATE TABLE test_geometry_table (id serial primary key, geom geometry(Point, 4326));"
+              psql -c "INSERT INTO test_geometry_table (geom) VALUES (ST_GeomFromText('POINT(0 0)', 4326));"
+              psql -c "SELECT * FROM test_geometry_table;"
+
               break
             fi
             sleep 1

Dockerfile

@@ -73,7 +73,7 @@ RUN set -ex \
     && rm -rf /build \
     && sed -r -i "s/[#]*\s*(shared_preload_libraries)\s*=\s*'(.*)'/\1 = 'timescaledb,\2'/;s/,'/'/" /usr/local/share/postgresql/postgresql.conf.sample
 
-# Add Citus to shared_preload_libraries
+# Update to shared_preload_libraries
 RUN echo "shared_preload_libraries = 'citus,timescaledb,pg_stat_statements'" >> /usr/local/share/postgresql/postgresql.conf.sample
 
 # Adding PG Vector
@@ -132,43 +132,99 @@ RUN set -ex \
     && rm -rf /tmp/citus.tar.gz /tmp/citus-${CITUS_VERSION} \
     && apk del .citus-deps .citus-build-deps
 
-## Adding PostGIS
-# Install PostGIS dependencies
-RUN apk add --no-cache --virtual .postgis-deps \
-    geos-dev \
-    gdal-dev \
-    proj-dev \
-    curl \
-    json-c-dev \
-    protobuf-c-dev
 
-# Install PostGIS
 ARG POSTGIS_VERSION
-RUN set -ex \
-    && apk add --no-cache --virtual .postgis-build-deps \
-        gcc \
+ARG POSTGIS_SHA256
+
+RUN set -eux \
+    \
+    &&  if   [ $(printf %.1s "$POSTGIS_VERSION") == 3 ]; then \
+            set -eux ; \
+            export GEOS_ALPINE_VER=3.11 ; \
+            export GDAL_ALPINE_VER=3.5 ; \
+            export PROJ_ALPINE_VER=9.1 ; \
+        elif [ $(printf %.1s "$POSTGIS_VERSION") == 2 ]; then \
+            set -eux ; \
+            export GEOS_ALPINE_VER=3.8 ; \
+            export GDAL_ALPINE_VER=3.2 ; \
+            export PROJ_ALPINE_VER=7.2 ; \
+            \
+            echo 'https://dl-cdn.alpinelinux.org/alpine/v3.14/main'      >> /etc/apk/repositories ; \
+            echo 'https://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories ; \
+            echo 'https://dl-cdn.alpinelinux.org/alpine/v3.13/main'      >> /etc/apk/repositories ; \
+            echo 'https://dl-cdn.alpinelinux.org/alpine/v3.13/community' >> /etc/apk/repositories ; \
+            \
+        else \
+            set -eux ; \
+            echo ".... unknown \$POSTGIS_VERSION ...." ; \
+            exit 1 ; \
+        fi \
+    \
+    && apk add --no-cache --virtual .fetch-deps \
+        ca-certificates \
+        openssl \
+        tar \
+    \
+    && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \
+    && echo "${POSTGIS_SHA256} *postgis.tar.gz" | sha256sum -c - \
+    && mkdir -p /usr/src/postgis \
+    && tar \
+        --extract \
+        --file postgis.tar.gz \
+        --directory /usr/src/postgis \
+        --strip-components 1 \
+    && rm postgis.tar.gz \
+    \
+    && apk add --no-cache --virtual .build-deps \
+        \
+        gdal-dev~=${GDAL_ALPINE_VER} \
+        geos-dev~=${GEOS_ALPINE_VER} \
+        proj-dev~=${PROJ_ALPINE_VER} \
+        \
+        autoconf \
+        automake \
+        clang-dev \
+        cunit-dev \
+        file \
         g++ \
-        libc-dev \
-        make \
+        gcc \
+        gettext-dev \
+        git \
+        json-c-dev \
+        libtool \
         libxml2-dev \
-        musl-dev \
+        llvm-dev \
+        make \
+        pcre-dev \
         perl \
-        clang \
-        geos-dev \
-        gdal-dev \
-        proj-dev \
         protobuf-c-dev \
-        llvm15-dev \
-        json-c-dev \
-    && POSTGIS_DOWNLOAD_URL="https://download.osgeo.org/postgis/source/postgis-${POSTGIS_VERSION}.tar.gz" \
-    && curl -L -o /tmp/postgis.tar.gz "${POSTGIS_DOWNLOAD_URL}" \
-    && tar -C /tmp -xvf /tmp/postgis.tar.gz \
-    && chown -R postgres:postgres /tmp/postgis-${POSTGIS_VERSION} \
-    && cd /tmp/postgis-${POSTGIS_VERSION} \
-    && PATH="/usr/local/pgsql/bin:$PATH" ./configure \
-    && make \
+    \
+# build PostGIS
+    \
+    && cd /usr/src/postgis \
+    && gettextize \
+    && ./autogen.sh \
+    && ./configure \
+        --with-pcredir="$(pcre-config --prefix)" \
+    && make -j$(nproc) \
     && make install \
-    && cd ~ \
-    && rm -rf /tmp/postgis.tar.gz /tmp/postgis-${POSTGIS_VERSION} \
-    && apk del .postgis-deps .postgis-build-deps
-    
+    \
+# add .postgis-rundeps
+    && apk add --no-cache --virtual .postgis-rundeps \
+        \
+        gdal~=${GDAL_ALPINE_VER} \
+        geos~=${GEOS_ALPINE_VER} \
+        proj~=${PROJ_ALPINE_VER} \
+        \
+        json-c \
+        libstdc++ \
+        pcre \
+        protobuf-c \
+        \
+        # ca-certificates: for accessing remote raster files
+        #   fix https://github.com/postgis/docker-postgis/issues/307
+        ca-certificates \
+# clean
+    && cd / \
+    && rm -rf /usr/src/postgis \
+    && apk del .fetch-deps .build-deps 

Makefile

@@ -4,7 +4,8 @@ NAME=postgres
 ORG=samagragovernance
 PG_VER=pg15
 CITUS_VERSION="11.2.0"
-POSTGIS_VERSION=3.1.4
+POSTGIS_VERSION=3.3.2
+POSTGIS_SHA256=2a6858d1df06de1c5f85a5b780773e92f6ba3a5dc09ac31120ac895242f5a77b
 PG_VER_NUMBER=$(shell echo $(PG_VER) | cut -c3-)
 TS_VERSION=main
 PREV_TS_VERSION=$(shell wget --quiet -O - https://raw.githubusercontent.com/timescale/timescaledb/${TS_VERSION}/version.config | grep update_from_version | sed -e 's!update_from_version = !!')
@@ -56,7 +57,7 @@ default: image
 	touch .build_$(TS_VERSION)_$(PG_VER)_oss
 
 .build_$(TS_VERSION)_$(PG_VER): Dockerfile
-	docker build --build-arg PG_VERSION=$(PG_VER_NUMBER) --build-arg TS_VERSION=$(TS_VERSION) --build-arg PREV_IMAGE=$(PREV_IMAGE) --build-arg CITUS_VERSION=$(CITUS_VERSION) --build-arg POSTGIS_VERSION=$(POSTGIS_VERSION) $(TAG) .
+	docker build --build-arg PG_VERSION=$(PG_VER_NUMBER) --build-arg TS_VERSION=$(TS_VERSION) --build-arg PREV_IMAGE=$(PREV_IMAGE) --build-arg CITUS_VERSION=$(CITUS_VERSION) --build-arg POSTGIS_VERSION=$(POSTGIS_VERSION) --build-arg POSTGIS_SHA256=$(POSTGIS_SHA256) $(TAG) .
 	touch .build_$(TS_VERSION)_$(PG_VER)
 
 image: .build_$(TS_VERSION)_$(PG_VER)

bitnami/Dockerfile

@@ -80,7 +80,6 @@ RUN set -ex \
             make \
             cmake \
             wget \
-            postgis \
     && mkdir -p /build/ \
     && git clone https://github.com/timescale/timescaledb /build/timescaledb \
     \
@@ -126,7 +125,25 @@ RUN set -ex \
         /var/tmp/* \
     \
     # Update shared_preload_libraries
-    && sed -i "s/#shared_preload_libraries = ''/shared_preload_libraries = 'citus,timescaledb,postgis'/g" /opt/bitnami/postgresql/conf/postgresql.conf
+    && sed -i "s/#shared_preload_libraries = ''/shared_preload_libraries = 'citus,timescaledb'/g" /opt/bitnami/postgresql/conf/postgresql.conf
+    
+# Add PostGIS Extension
+ARG POSTGIS_MAJOR
+ARG PG_MAJOR
+ARG POSTGIS_VERSION
+
+RUN apt-get update \
+     && apt-get install -y lsb-release gnupg2 \
+     && echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -cs)-pgdg main" | tee /etc/apt/sources.list.d/pgdg.list \
+     && wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+     && apt-get update \
+      && apt-cache showpkg postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR \
+      && apt-get install -y --no-install-recommends \
+           ca-certificates \
+           \
+           postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR=$POSTGIS_VERSION \
+           postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
+      && rm -rf /var/lib/apt/lists/*
 
 USER 1001
 

bitnami/Makefile

@@ -4,7 +4,10 @@ NAME=timescaledb
 ORG=timescaledev
 PG_VER=pg15
 CITUS_VERSION="11.2.0"
-POSTGIS_VERSION=3.1.4
+POSTGIS_MAJOR=3
+PG_MAJOR=15
+POSTGIS_VERSION=3.3.2+dfsg-1.pgdg110+1
+
 PG_VER_NUMBER=$(shell echo $(PG_VER) | cut -c3-)
 
 TS_VERSION=main
@@ -23,7 +26,7 @@ default: image
 .build_$(TS_VERSION)_$(PG_VER): Dockerfile
 	test -n "$(TS_VERSION)"  # TS_VERSION
 	test -n "$(PREV_TS_VERSION)"  # PREV_TS_VERSION
-	docker build -f ./Dockerfile --build-arg PG_VERSION=$(PG_VER_NUMBER) --build-arg TS_VERSION=$(TS_VERSION) --build-arg PREV_IMAGE=$(PREV_IMAGE) --build-arg CITUS_VERSION=$(CITUS_VERSION) --build-arg POSTGIS_VERSION=$(POSTGIS_VERSION) $(TAG) ..
+	docker build -f ./Dockerfile --build-arg PG_VERSION=$(PG_VER_NUMBER) --build-arg TS_VERSION=$(TS_VERSION) --build-arg PREV_IMAGE=$(PREV_IMAGE) --build-arg CITUS_VERSION=$(CITUS_VERSION) --build-arg POSTGIS_MAJOR=$(POSTGIS_MAJOR) --build-arg PG_MAJOR=$(PG_MAJOR) --build-arg POSTGIS_VERSION=$(POSTGIS_VERSION) $(TAG)  ..
 	touch .build_$(TS_VERSION)_$(PG_VER)-bitnami
 
 image: .build_$(TS_VERSION)_$(PG_VER)

bitnami/timescaledb-bitnami-entrypoint.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-# We have to use the Bitnami configuration variable to add TimescaleDB, Citus, and PostGIS to
+# We have to use the Bitnami configuration variable to add TimescaleDB, Citus to
 # the shared preload list, or else it gets overwritten.
 if [ -z "$POSTGRESQL_SHARED_PRELOAD_LIBRARIES" ]
 then
-    POSTGRESQL_SHARED_PRELOAD_LIBRARIES="citus,timescaledb,postgis"
+    POSTGRESQL_SHARED_PRELOAD_LIBRARIES="citus,timescaledb"
 else
-    POSTGRESQL_SHARED_PRELOAD_LIBRARIES="citus,timescaledb,postgis,$POSTGRESQL_SHARED_PRELOAD_LIBRARIES"
+    POSTGRESQL_SHARED_PRELOAD_LIBRARIES="citus,timescaledb,$POSTGRESQL_SHARED_PRELOAD_LIBRARIES"
 fi
 export POSTGRESQL_SHARED_PRELOAD_LIBRARIES