From 114b36e6644f9a5a66d1a6d30b09a7e0127185e3 Mon Sep 17 00:00:00 2001 From: Piyush Raj Date: Sun, 10 Mar 2024 14:02:32 +0530 Subject: [PATCH 1/2] update postgis: - utilize system headers for compilation - patch postgis version to 3.4.2 Signed-off-by: Piyush Raj --- Makefile | 2 +- bitnami/Dockerfile | 6 ++++-- bitnami/Makefile | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 54be3b7..d0d742d 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ PG_VER=pg15 PG_VER_NUMBER=$(shell echo $(PG_VER) | cut -c3-) TS_VERSION=2.13.0 PG_CRON_VERSION=v1.6.0 -POSTGIS_VERSION=3.4.1 +POSTGIS_VERSION=3.4.2 CITUS_VERSION=12.1.0 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 = !!') PREV_TS_IMAGE="timescale/timescaledb:$(PREV_TS_VERSION)-pg$(PG_VER_NUMBER)$(PREV_EXTRA)" diff --git a/bitnami/Dockerfile b/bitnami/Dockerfile index 8d90bd4..0a0b15c 100644 --- a/bitnami/Dockerfile +++ b/bitnami/Dockerfile @@ -177,6 +177,7 @@ RUN set -eux \ g++\ gcc \ make \ + libpcre3-dev \ && wget -O postgis.tar.gz "https://github.com/postgis/postgis/archive/${POSTGIS_VERSION}.tar.gz" \ && mkdir -p /usr/src/postgis \ && tar \ @@ -189,10 +190,11 @@ RUN set -eux \ # build PostGIS \ && cd /usr/src/postgis \ - && gettextize \ && ./autogen.sh \ && ./configure \ - --with-pcredir="$(pcre-config --prefix)" --with-geosconfig="/usr/bin/geos-config"\ + --with-pcredir="$(pcre-config --prefix)" \ + --with-geosconfig="/usr/bin/geos-config" \ + CFLAGS="-idirafter'/opt/bitnami/postgresql/include'" # # Prefer latest system headers over Bitnami outdated libraries \ && make -j$(nproc) \ && make install \ && cd / \ diff --git a/bitnami/Makefile b/bitnami/Makefile index 1e2e037..a6c49b9 100644 --- a/bitnami/Makefile +++ b/bitnami/Makefile @@ -6,7 +6,7 @@ PG_VER=pg15 PG_VER_NUMBER=$(shell echo $(PG_VER) | cut -c3-) PG_CRON_VERSION=v1.6.0 TS_VERSION=2.13.0 -POSTGIS_VERSION=3.4.1 +POSTGIS_VERSION=3.4.2 CITUS_VERSION=12.1.0 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 = !!') PREV_TS_IMAGE="timescale/timescaledb:$(PREV_TS_VERSION)-pg$(PG_VER_NUMBER)-bitnami" From 4fe3fb5242ab164d7aa893809f8554e25513136b Mon Sep 17 00:00:00 2001 From: Piyush Raj Date: Sun, 10 Mar 2024 14:54:33 +0530 Subject: [PATCH 2/2] Update shared_preload_libraries order Signed-off-by: Piyush Raj --- Dockerfile | 4 ++-- bitnami/timescaledb-bitnami-entrypoint.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0bb9a54..940d687 100644 --- a/Dockerfile +++ b/Dockerfile @@ -75,7 +75,7 @@ RUN set -ex \ # Update to shared_preload_libraries -RUN echo "shared_preload_libraries = 'timescaledb,pg_cron,citus'" >> /usr/local/share/postgresql/postgresql.conf.sample +RUN echo "shared_preload_libraries = 'citus,timescaledb,pg_cron'" >> /usr/local/share/postgresql/postgresql.conf.sample # Adding PG Vector RUN cd /tmp @@ -218,7 +218,7 @@ RUN set -ex \ curl-dev \ lz4-dev \ zstd-dev \ - clang-15 \ + clang15 \ krb5-dev \ icu-dev \ libxslt-dev \ diff --git a/bitnami/timescaledb-bitnami-entrypoint.sh b/bitnami/timescaledb-bitnami-entrypoint.sh index be7c3ec..db0ab16 100755 --- a/bitnami/timescaledb-bitnami-entrypoint.sh +++ b/bitnami/timescaledb-bitnami-entrypoint.sh @@ -4,9 +4,9 @@ # shared preload list, or else it gets overwritten. if [ -z "$POSTGRESQL_SHARED_PRELOAD_LIBRARIES" ] then - POSTGRESQL_SHARED_PRELOAD_LIBRARIES="timescaledb,pg_cron,citus" + POSTGRESQL_SHARED_PRELOAD_LIBRARIES="citus,timescaledb,pg_cron" else - POSTGRESQL_SHARED_PRELOAD_LIBRARIES="$POSTGRESQL_SHARED_PRELOAD_LIBRARIES,timescaledb,pg_cron,citus" + POSTGRESQL_SHARED_PRELOAD_LIBRARIES="citus,timescaledb,pg_cron,$POSTGRESQL_SHARED_PRELOAD_LIBRARIES" fi export POSTGRESQL_SHARED_PRELOAD_LIBRARIES