Merge branch 'minor-update' into 'master'

Update Postgres Docker images to latest minors (17.4, 16.8, 15.12, 14.17, 13.20, 12.22)

See merge request postgres-ai/custom-images!69

Author: vitabaks

README.md

@@ -10,7 +10,7 @@ Storage-optimized: the size of each image is ~300-500 MiB.
 Use these images with Database Lab, when you need HypoPG or anything else.
 
 ### What's inside
-Available PostgreSQL versions: 9.6 (EOL), 10 (EOL), 11 (EOL), 12, 13, 14, 15, 16, 17. Extensions:
+Available PostgreSQL versions: 9.6 (EOL), 10 (EOL), 11 (EOL), 12(EOL), 13, 14, 15, 16, 17. Extensions:
 - all official ["core" contrib modules](https://www.postgresql.org/docs/current/contrib.html)
 - [bg_mon](https://github.com/CyberDem0n/bg_mon)
 - [Citus](https://github.com/citusdata/citus)
@@ -35,12 +35,6 @@ Available PostgreSQL versions: 9.6 (EOL), 10 (EOL), 11 (EOL), 12, 13, 14, 15, 16
 - [timescaledb](https://github.com/timescale/timescaledb)
 - [pgvector](https://github.com/pgvector/pgvector)
 
-#### Not included in the PostgreSQL 17 image (yet)
-The PostgreSQL 17 image is now missing the following extensions (they will be added in the future):
-- powa
-- citus
-- topn
-
 ### How to extend
 - You can fork this repository and extend `Dockerfile`, then build your own images
 - Proposals to add more extensions to this repository are welcome https://gitlab.com/postgres-ai/custom-images/-/issues

extended-postgres/Dockerfile

@@ -18,16 +18,16 @@ ARG PG_SERVER_PORT
 ENV PG_SERVER_PORT=${PG_SERVER_PORT:-5432}
 
 ARG WALG_VERSION
-ENV WALG_VERSION=${WALG_VERSION:-3.0.3}
+ENV WALG_VERSION=${WALG_VERSION:-3.0.5}
 
 ARG PG_TIMETABLE_VERSION
-ENV PG_TIMETABLE_VERSION=${PG_TIMETABLE_VERSION:-5.9.0}
+ENV PG_TIMETABLE_VERSION=${PG_TIMETABLE_VERSION:-5.11.0}
 
 ARG LOGERRORS_VERSION
 ENV LOGERRORS_VERSION=${LOGERRORS_VERSION:-2.1.3}
 
 ARG PGVECTOR_VERSION
-ENV PGVECTOR_VERSION=${PGVECTOR_VERSION:-0.7.4}
+ENV PGVECTOR_VERSION=${PGVECTOR_VERSION:-0.8.0}
 
 # https://gitlab.com/postgres-ai/custom-images/-/merge_requests/56
 ARG PG_CRON_VERSION
@@ -67,9 +67,7 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/partial \
          && make && make install; \
       fi \
     # powa extension
-    && if [ $(echo "$PG_SERVER_VERSION < 17" | /usr/bin/bc) = "1" ]; then \
-         apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-powa; \
-       fi \
+    && apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-powa \
     # pg_auth_mon extension
     && if [ "${PG_SERVER_VERSION}" = "9.6" ]; then \
          cd /tmp && git clone --branch v1.0 --single-branch https://github.com/RafiaSabih/pg_auth_mon.git \
@@ -87,21 +85,22 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/partial \
               timescaledb-2-postgresql-${PG_SERVER_VERSION}; \
        fi \
     # citus extension
-    && if [ $(echo "$PG_SERVER_VERSION > 10" | /usr/bin/bc) = "1" ] && [ $(echo "$PG_SERVER_VERSION < 17" | /usr/bin/bc) = "1" ]; then \
+    && if [ $(echo "$PG_SERVER_VERSION > 10" | /usr/bin/bc) = "1" ]; then \
          if [ "${PG_SERVER_VERSION}" = "11" ]; then CITUS_VERSION="10.0"; \
          elif [ "${PG_SERVER_VERSION}" = "12" ]; then CITUS_VERSION="10.2"; \
          elif [ "${PG_SERVER_VERSION}" = "13" ]; then CITUS_VERSION="11.3"; \
          elif [ "${PG_SERVER_VERSION}" = "14" ]; then CITUS_VERSION="12.1"; \
-         elif [ "${PG_SERVER_VERSION}" = "15" ]; then CITUS_VERSION="12.1"; \
-         elif [ "${PG_SERVER_VERSION}" = "16" ]; then CITUS_VERSION="12.1"; \
+         elif [ "${PG_SERVER_VERSION}" = "15" ]; then CITUS_VERSION="13.0"; \
+         elif [ "${PG_SERVER_VERSION}" = "16" ]; then CITUS_VERSION="13.0"; \
+         elif [ "${PG_SERVER_VERSION}" = "17" ]; then CITUS_VERSION="13.0"; \
          fi \
          && curl -s https://install.citusdata.com/community/deb.sh | bash \
          && apt-get install --no-install-recommends -y postgresql-"${PG_SERVER_VERSION}"-citus-"${CITUS_VERSION}"; \
        fi \
     # hll extension
     && apt-get install --no-install-recommends -y postgresql-"${PG_SERVER_VERSION}"-hll \
     # topn extension
-    && if [ $(echo "$PG_SERVER_VERSION > 9.6" | /usr/bin/bc) = "1" ] && [ $(echo "$PG_SERVER_VERSION < 17" | /usr/bin/bc) = "1" ]; then \
+    && if [ $(echo "$PG_SERVER_VERSION > 9.6" | /usr/bin/bc) = "1" ]; then \
          curl -s https://install.citusdata.com/community/deb.sh | bash \
          && apt-get install --no-install-recommends -y postgresql-"${PG_SERVER_VERSION}"-topn; \
        fi \
@@ -131,12 +130,7 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/partial \
          pgxn install ddlx && pgxn install postgresql_anonymizer; \
        fi \
     # pg_stat_kcache extension
-    && if [ $(echo "$PG_SERVER_VERSION < 17" | /usr/bin/bc) = "1" ]; then \
-         apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-pg-stat-kcache; \
-       elif [ $(echo "$PG_SERVER_VERSION == 17" | /usr/bin/bc) = "1" ]; then \
-         cd /tmp && git clone --branch REL2_3_0 https://github.com/powa-team/pg_stat_kcache.git \
-         && cd pg_stat_kcache && make && make install; \
-       fi \
+    && apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-pg-stat-kcache \
     # pg_wait_sampling extension
     && apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-pg-wait-sampling \
     # pg_qualstats extension
@@ -164,19 +158,17 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/partial \
          && USE_PGXS=1 make && USE_PGXS=1 make install; \
        fi \
     # pgvector extension
-    && if [ $(echo "$PG_SERVER_VERSION >= 12" | /usr/bin/bc) = "1" ]; then \
-        cd /tmp && git clone --branch v${PGVECTOR_VERSION} https://github.com/pgvector/pgvector.git \
+    && if [ $(echo "$PG_SERVER_VERSION >= 11" | /usr/bin/bc) = "1" ]; then \
+        if [ "${PG_SERVER_VERSION}" = "11" ]; then PGVECTOR_VERSION="0.5.1"; \
+        elif [ "${PG_SERVER_VERSION}" = "12" ]; then PGVECTOR_VERSION="0.7.4"; \
+        else PGVECTOR_VERSION="${PGVECTOR_VERSION}"; \
+        fi \
+        && cd /tmp && git clone --branch v${PGVECTOR_VERSION} https://github.com/pgvector/pgvector.git \
         && cd pgvector && make OPTFLAGS="" install \
         && mkdir /usr/share/doc/pgvector \
         && cp LICENSE README.md /usr/share/doc/pgvector \
         && cp sql/vector.sql /usr/share/postgresql/${PG_SERVER_VERSION}/extension/vector--${PGVECTOR_VERSION}.sql; \
-      elif [ $(echo "$PG_SERVER_VERSION == 11" | /usr/bin/bc) = "1" ]; then \
-        cd /tmp && git clone --branch v0.5.1 https://github.com/pgvector/pgvector.git \
-        && cd pgvector && make OPTFLAGS="" install \
-        && mkdir /usr/share/doc/pgvector \
-        && cp LICENSE README.md /usr/share/doc/pgvector \
-        && cp sql/vector.sql /usr/share/postgresql/11/extension/vector--0.5.1.sql; \
-      fi \
+    fi \
     # pgBackRest
     && apt-get install --no-install-recommends -y \
        pgbackrest zstd openssh-client \

extended-postgres/build-images-ci.yml

@@ -2,11 +2,11 @@ stages:
   - build-image
 
 .job_template: &build_image_definition_dh
-  image: docker:19
+  image: docker:24.0.6
   stage: build-image
   services:
     - alias: docker
-      name: docker:19.03.5-dind
+      name: docker:24.0.6-dind
   script:
     - apk add --no-cache bash
     - bash ./ci_docker_build_push.sh
@@ -18,11 +18,11 @@ stages:
     DOCKER_NAME: "postgresai/extended-postgres"
 
 .job_template: &build_image_definition_gl
-  image: docker:19
+  image: docker:24.0.6
   stage: build-image
   services:
     - alias: docker
-      name: docker:19.03.5-dind
+      name: docker:24.0.6-dind
   script:
     - apk add --no-cache bash
     - bash ./ci_docker_build_push.sh

extended-postgres/test-images-ci.yml

@@ -2,11 +2,11 @@ stages:
   - test-image
 
 .job_template: &test_image_definition
-  image: docker:19
+  image: docker:24.0.6
   stage: test-image
   services:
     - alias: docker
-      name: docker:19.03.5-dind
+      name: docker:24.0.6-dind
   script:
     - apk add --no-cache bash
     - chmod +x extended-postgres/test/images_test.sh

extended-postgres/test/images_test.sh

@@ -92,9 +92,7 @@ docker stop "${PG_CONTAINER_NAME}" >/dev/null 2>&1
 # configure postgresql.conf
 CLEANED_PG_SERVER_VERSION=$(echo "$PG_SERVER_VERSION" | sed 's/rc.*//')
 BASE_LIBRARIES="pg_stat_statements,pg_stat_kcache,pg_cron,pgaudit,bg_mon"
-if [ "$(echo "$CLEANED_PG_SERVER_VERSION == 17" | /usr/bin/bc)" = "1" ]; then
-  SHARED_PRELOAD_LIBRARIES="timescaledb,anon,${BASE_LIBRARIES}"
-elif [ "$(echo "$CLEANED_PG_SERVER_VERSION >= 12" | /usr/bin/bc)" = "1" ]; then
+if [ "$(echo "$CLEANED_PG_SERVER_VERSION >= 12" | /usr/bin/bc)" = "1" ]; then
   SHARED_PRELOAD_LIBRARIES="citus,timescaledb,anon,${BASE_LIBRARIES}"
 elif [ "$(echo "$CLEANED_PG_SERVER_VERSION == 11" | /usr/bin/bc)" = "1" ]; then
   SHARED_PRELOAD_LIBRARIES="citus,anon,${BASE_LIBRARIES}"

migration-tools/build-images-migration-tools.yml

@@ -2,11 +2,11 @@ stages:
   - build-image
 
 .job_template: &build_image_definition_dh
-  image: docker:19
+  image: docker:24.0.6
   stage: build-image
   services:
     - alias: docker
-      name: docker:19.03.5-dind
+      name: docker:24.0.6-dind
   script:
     - apk add --no-cache bash
     - bash ./ci_docker_build_push.sh
@@ -17,11 +17,11 @@ stages:
     DOCKER_NAME: "postgresai/migration-tools"
 
 .job_template: &build_image_definition_gl
-  image: docker:19
+  image: docker:24.0.6
   stage: build-image
   services:
     - alias: docker
-      name: docker:19.03.5-dind
+      name: docker:24.0.6-dind
   script:
     - apk add --no-cache bash
     - bash ./ci_docker_build_push.sh