Merge pull request #33 from jayanth-kumar-morem/main

Author: ChakshuGautam

.github/workflows/smoke-test.yml

@@ -71,6 +71,9 @@ jobs:
               psql -c "INSERT INTO test_geometry_table (geom) VALUES (ST_GeomFromText('POINT(0 0)', 4326));"
               psql -c "SELECT * FROM test_geometry_table;"
 
+              psql -c "CREATE EXTENSION zombodb;"
+              psql -c "SELECT * FROM pg_extension WHERE extname = 'zombodb';"
+
               break
             fi
             sleep 1

Dockerfile

@@ -87,9 +87,9 @@ RUN apk add --no-cache --virtual .build-deps \
                 krb5-dev \
                 libc-dev \
                 llvm15 \
-                clang \
                 make \
                 cmake \
+                clang15 \
                 util-linux-dev \
                 && git clone --branch v0.4.1 https://github.com/pgvector/pgvector.git \
                 && cd /pgvector \
@@ -141,8 +141,8 @@ 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 ; \
+            export GDAL_ALPINE_VER=3.6.4-r4 ; \
+            export PROJ_ALPINE_VER=9.2.0-r0 ; \
         elif [ $(printf %.1s "$POSTGIS_VERSION") == 2 ]; then \
             set -eux ; \
             export GEOS_ALPINE_VER=3.8 ; \
@@ -184,6 +184,7 @@ RUN set -eux \
         autoconf \
         automake \
         clang-dev \
+        clang15 \
         cunit-dev \
         file \
         g++ \
@@ -194,6 +195,7 @@ RUN set -eux \
         libtool \
         libxml2-dev \
         llvm-dev \
+        llvm15 \
         make \
         pcre-dev \
         perl \
@@ -226,3 +228,32 @@ RUN set -eux \
     && cd / \
     && rm -rf /usr/src/postgis \
     && apk del .fetch-deps .build-deps 
+
+ENV RUSTFLAGS="-C target-feature=-crt-static"
+ARG PG_VER
+RUN apk add --no-cache --virtual .zombodb-build-deps \
+    git \
+	curl \
+	bash \
+	ruby-dev \
+	ruby-etc \
+	musl-dev \
+	make \
+	gcc \
+	coreutils \
+	util-linux-dev \
+	musl-dev \
+	openssl-dev \
+    clang15 \
+	tar \
+    && gem install --no-document fpm \
+    && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y \
+    && PATH=$HOME/.cargo/bin:$PATH \
+    && cargo install cargo-pgrx --version 0.8.3 \
+    && cargo pgrx init --${PG_VER}=$(which pg_config) \
+    && git clone https://github.com/zombodb/zombodb.git \
+    && cd ./zombodb \
+    && cargo pgrx install --release \
+    && cd .. \
+    && rm -rf ./zombodb \
+    && apk del .zombodb-build-deps

Makefile

@@ -57,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) --build-arg POSTGIS_SHA256=$(POSTGIS_SHA256) $(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 PG_VER=$(PG_VER) --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

@@ -122,10 +122,7 @@ RUN set -ex \
         "${HOME}/.cache" \
         /var/lib/apt/lists/* \
         /tmp/*               \
-        /var/tmp/* \
-    \
-    # Update shared_preload_libraries
-    && sed -i "s/#shared_preload_libraries = ''/shared_preload_libraries = 'citus,timescaledb'/g" /opt/bitnami/postgresql/conf/postgresql.conf
+        /var/tmp/* 
 
 # Add PostGIS Extension
 ARG POSTGIS_MAJOR
@@ -145,6 +142,41 @@ RUN apt-get update \
            postgresql-$PG_MAJOR-postgis-$POSTGIS_MAJOR-scripts \
       && rm -rf /var/lib/apt/lists/*
 
+# Install zombodb extension
+RUN apt-get update -y -qq --fix-missing \
+    && apt-get install -y wget gnupg \
+    && echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main" >> /etc/apt/sources.list \
+    && echo "deb http://security.ubuntu.com/ubuntu bionic-security main" >> /etc/apt/sources.list \
+    && wget --quiet -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
+    && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 \
+    && apt update \
+    && apt-get update -y --fix-missing \
+    && apt-get install -y git curl clang-14 llvm-14 gcc make build-essential libz-dev zlib1g-dev strace pkg-config lsb-release wget software-properties-common gnupg libreadline-dev libgdbm-dev libssl1.0-dev \
+    && wget https://www.openssl.org/source/openssl-1.0.2l.tar.gz \
+    && tar -xzvf openssl-1.0.2l.tar.gz \
+    && cd openssl-1.0.2l \
+    && ./config \
+    && make install \
+    && ln -sf /usr/local/ssl/bin/openssl `which openssl` \
+    && mkdir ruby  \
+	&& cd ruby \
+	&& wget https://cache.ruby-lang.org/pub/ruby/2.3/ruby-2.3.0.tar.gz \
+	&& tar xvfz ruby-2.3.0.tar.gz \
+	&& cd ruby-2.3.0 \
+	&& ./configure  --with-openssl-dir=/usr/include/openssl-1.0 \
+	&& make -j64 \
+	&& make install \
+    && gem install --no-document fpm \
+    && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
+    && export PATH="/.cargo/bin:$PATH" \
+    && export PGRX_HOME="/.pgrx/" \
+    && mkdir -p $PGRX_HOME \
+    && cargo install cargo-pgrx --version 0.8.3 \
+    && cargo pgrx init --pg${PG_MAJOR}=/opt/bitnami/postgresql/bin/pg_config \
+    && git clone https://github.com/zombodb/zombodb.git \
+    && cd zombodb \
+    && export PATH="/.cargo/bin:$PATH" && cargo pgrx install --release
+
 USER 1001
 
 ENTRYPOINT [ "/opt/bitnami/scripts/postgresql/timescaledb-bitnami-entrypoint.sh" ]

bitnami/timescaledb-bitnami-entrypoint.sh

@@ -4,9 +4,9 @@
 # the shared preload list, or else it gets overwritten.
 if [ -z "$POSTGRESQL_SHARED_PRELOAD_LIBRARIES" ]
 then
-    POSTGRESQL_SHARED_PRELOAD_LIBRARIES="citus,timescaledb"
+    POSTGRESQL_SHARED_PRELOAD_LIBRARIES="citus,timescaledb,zombodb"
 else
-    POSTGRESQL_SHARED_PRELOAD_LIBRARIES="citus,timescaledb,$POSTGRESQL_SHARED_PRELOAD_LIBRARIES"
+    POSTGRESQL_SHARED_PRELOAD_LIBRARIES="citus,timescaledb,zombodb,$POSTGRESQL_SHARED_PRELOAD_LIBRARIES"
 fi
 export POSTGRESQL_SHARED_PRELOAD_LIBRARIES