Merge branch 'postgres-17' into 'master'

Add PostgreSQL 17rc1 image

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

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, 12, 13, 14, 15, 16. Extensions:
+Available PostgreSQL versions: 9.6 (EOL), 10 (EOL), 11 (EOL), 12, 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,10 +35,14 @@ Available PostgreSQL versions: 9.6 (EOL), 10 (EOL), 11, 12, 13, 14, 15, 16. Exte
 - [timescaledb](https://github.com/timescale/timescaledb)
 - [pgvector](https://github.com/pgvector/pgvector)
 
-#### Not included in the PostgreSQL 16 image (yet)
-The PostgreSQL 16 image is now missing the following extensions (they will be added in the future):
-- pg_auth_mon
-- set_user
+#### 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):
+- pg_repack
+- powa
+- timescaledb
+- citus
+- topn
+- pg_qualstats
 
 ### How to extend
 - You can fork this repository and extend `Dockerfile`, then build your own images

extended-postgres/Dockerfile

@@ -23,9 +23,6 @@ ENV WALG_VERSION=${WALG_VERSION:-3.0.3}
 ARG PG_TIMETABLE_VERSION
 ENV PG_TIMETABLE_VERSION=${PG_TIMETABLE_VERSION:-5.9.0}
 
-ARG SET_USER_VERSION
-ENV SET_USER_VERSION=${SET_USER_VERSION:-REL4_1_0}
-
 ARG LOGERRORS_VERSION
 ENV LOGERRORS_VERSION=${LOGERRORS_VERSION:-2.1.3}
 
@@ -43,7 +40,7 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/partial \
     && apt-get update -o Acquire::CompressionTypes::Order::=gz \
     && apt-get install --no-install-recommends -y wget make gcc unzip sudo git \
        curl libc6-dev apt-transport-https ca-certificates pgxnclient bc \
-       build-essential libssl-dev krb5-multidev libkrb5-dev lsb-release apt-utils \
+       build-essential libssl-dev krb5-multidev libkrb5-dev lsb-release apt-utils flex \
     && apt-get install --no-install-recommends -y postgresql-server-dev-${PG_SERVER_VERSION} \
     # plpython3 (procedural language implementation for Python 3.x)
     && apt-get install --no-install-recommends -y postgresql-plpython3-${PG_SERVER_VERSION} \
@@ -52,36 +49,37 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/partial \
          apt-get install --no-install-recommends -y postgresql-9.6-amcheck; \
        fi \
     # pg_repack extension
-    && apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-repack \
+    && if [ $(echo "$PG_SERVER_VERSION < 17" | /usr/bin/bc) = "1" ]; then \
+         apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-repack; \
+       fi \
     # hypopg extension
     && apt-get install --no-install-recommends -y \
        postgresql-${PG_SERVER_VERSION}-hypopg \
        postgresql-${PG_SERVER_VERSION}-hypopg-dbgsym \
     # pgaudit extension
     && apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-pgaudit \
     # pg_hint_plan extension
-    && if [ $(echo "$PG_SERVER_VERSION < 17" | /usr/bin/bc) = "1" ]; then \
+    && if [ $(echo "$PG_SERVER_VERSION > 11" | /usr/bin/bc) = "1" ] && [ $(echo "$PG_SERVER_VERSION < 17" | /usr/bin/bc) = "1" ]; then \
+         apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-pg-hint-plan; \
+       else \
          export PG_PLAN_HINT_VERSION=$(echo $PG_SERVER_VERSION | sed 's/\.//') \
-         && wget --quiet -O /tmp/pg_hint_plan.zip \
-           https://github.com/ossc-db/pg_hint_plan/archive/PG${PG_PLAN_HINT_VERSION}.zip \
+         && wget --quiet -O /tmp/pg_hint_plan.zip https://github.com/ossc-db/pg_hint_plan/archive/PG${PG_PLAN_HINT_VERSION}.zip \
          && unzip /tmp/pg_hint_plan.zip -d /tmp \
          && cd /tmp/pg_hint_plan-PG${PG_PLAN_HINT_VERSION} \
          && make && make install; \
-       fi \
+      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 \
     # pg_auth_mon extension
-    && if [ $(echo "$PG_SERVER_VERSION < 16" | /usr/bin/bc) = "1" ]; then \
-        if [ "${PG_SERVER_VERSION}" = "9.6" ]; then \
-          cd /tmp && git clone --branch v1.0 --single-branch https://github.com/RafiaSabih/pg_auth_mon.git \
-          && cd pg_auth_mon && USE_PGXS=1 make && USE_PGXS=1 make install; \
-        elif [ $(echo "$PG_SERVER_VERSION > 10" | /usr/bin/bc) = "1" ]; then \
-          cd /tmp && git clone --branch v2.0 --single-branch https://github.com/RafiaSabih/pg_auth_mon.git \
-          && cd pg_auth_mon && USE_PGXS=1 make && USE_PGXS=1 make install; \
-        fi \
-      fi \
+    && if [ "${PG_SERVER_VERSION}" = "9.6" ]; then \
+         cd /tmp && git clone --branch v1.0 --single-branch https://github.com/RafiaSabih/pg_auth_mon.git \
+         && cd pg_auth_mon && USE_PGXS=1 make && USE_PGXS=1 make install; \
+       elif [ $(echo "$PG_SERVER_VERSION > 10" | /usr/bin/bc) = "1" ]; then \
+         cd /tmp && git clone --branch v3.0 --single-branch https://github.com/RafiaSabih/pg_auth_mon.git \
+         && cd pg_auth_mon && USE_PGXS=1 make && USE_PGXS=1 make install; \
+       fi \
     # timescaledb extension
     && if [ $(echo "$PG_SERVER_VERSION > 11" | /usr/bin/bc) = "1" ] && [ $(echo "$PG_SERVER_VERSION < 17" | /usr/bin/bc) = "1" ]; then \
          echo "deb https://packagecloud.io/timescale/timescaledb/debian/ $(lsb_release -c -s) main" > /etc/apt/sources.list.d/timescaledb.list \
@@ -105,7 +103,7 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/partial \
     # 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" ]; then \
+    && if [ $(echo "$PG_SERVER_VERSION > 9.6" | /usr/bin/bc) = "1" ] && [ $(echo "$PG_SERVER_VERSION < 17" | /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 \
@@ -115,43 +113,48 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/partial \
       && rm -rf pg_timetable_Linux_x86_64.deb \
     # pg_show_plans extension
     && if [ $(echo "$PG_SERVER_VERSION > 11" | /usr/bin/bc) = "1" ]; then \
-         cd /tmp && git clone https://github.com/cybertec-postgresql/pg_show_plans.git \
-         && cd pg_show_plans \
-         && export USE_PGXS=1 && make && make install; \
+         apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-show-plans; \
        fi \
     # pg_cron extension
     && if [ $(echo "$PG_SERVER_VERSION > 9.6" | /usr/bin/bc) = "1" ] && [ $(echo "$PG_SERVER_VERSION < 16" | /usr/bin/bc) = "1" ]; then \
         cd /tmp && git clone --branch v${PG_CRON_VERSION} --single-branch https://github.com/citusdata/pg_cron.git \
           && cd pg_cron \
           && make && make install; \
-        elif [ "${PG_SERVER_VERSION}" = "9.6" ] || [ "$PG_SERVER_VERSION" = "16" ]; then \
+        else \
           apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-cron; \
        fi \
     # postgresql_anonymizer extension
     && if [ $(echo "$PG_SERVER_VERSION > 9.6" | /usr/bin/bc) = "1" ]; then \
          pgxn install ddlx && pgxn install postgresql_anonymizer; \
        fi \
     # pg_stat_kcache extension
-    && apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-pg-stat-kcache \
-    # pg_wait_sampling extension
     && if [ $(echo "$PG_SERVER_VERSION < 17" | /usr/bin/bc) = "1" ]; then \
-         apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-pg-wait-sampling; \
+         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 \
+    # pg_wait_sampling extension
+    && apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-pg-wait-sampling \
     # pg_qualstats extension
-    && apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-pg-qualstats \
+    && if [ $(echo "$PG_SERVER_VERSION < 17" | /usr/bin/bc) = "1" ]; then \
+         apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-pg-qualstats; \
+       fi \
     # bg_mon extension
     && apt-get install -y libevent-dev libbrotli-dev \
       && cd /tmp && git clone https://github.com/CyberDem0n/bg_mon.git && cd bg_mon \
       && USE_PGXS=1 make && USE_PGXS=1 make install && cd .. \
     # pgextwlist extension
     && apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-pgextwlist \
     # set_user extension
-    && if [ $(echo "$PG_SERVER_VERSION >= 12" | /usr/bin/bc) = "1" ]; then \
-         cd /tmp && git clone https://github.com/pgaudit/set_user.git \
-         && cd set_user && git checkout ${SET_USER_VERSION} && make USE_PGXS=1 && make USE_PGXS=1 install; \
-       elif [ $(echo "$PG_SERVER_VERSION < 12" | /usr/bin/bc) = "1" ]; then \
-         cd /tmp && git clone https://github.com/pgaudit/set_user.git \
-         && cd set_user && git checkout REL4_0_1 && make USE_PGXS=1 && make USE_PGXS=1 install; \
+    && if [ $(echo "$PG_SERVER_VERSION > 9.6" | /usr/bin/bc) = "1" ] && [ $(echo "$PG_SERVER_VERSION < 17" | /usr/bin/bc) = "1" ]; then \
+         apt-get install --no-install-recommends -y postgresql-${PG_SERVER_VERSION}-set-user; \
+       elif [ $(echo "$PG_SERVER_VERSION == 17" | /usr/bin/bc) = "1" ]; then \
+         cd /tmp && git clone --branch REL4_1_0 https://github.com/pgaudit/set_user.git \
+         && cd set_user && make USE_PGXS=1 && make USE_PGXS=1 install; \
+       elif [ $(echo "$PG_SERVER_VERSION == 9.6" | /usr/bin/bc) = "1" ]; then \
+         cd /tmp && git clone --branch REL4_0_1 https://github.com/pgaudit/set_user.git \
+         && cd set_user && make USE_PGXS=1 && make USE_PGXS=1 install; \
        fi \
     # logerrors extension
     && if [ $(echo "$PG_SERVER_VERSION > 9.6" | /usr/bin/bc) = "1" ]; then \

extended-postgres/build-images-ci.yml

@@ -110,6 +110,14 @@ build-extended-postgres-16-image-latest:
     PG_SERVER_VERSION: "16"
     TAGS: "${DOCKER_NAME}:${PG_SERVER_VERSION},${DOCKER_NAME}:${PG_SERVER_VERSION}-${CI_COMMIT_TAG}"
 
+build-extended-postgres-17-image-latest:
+  <<: *build_image_definition_dh
+  <<: *only_tag_release
+  variables:
+    <<: *extended_image_vars_dh
+    PG_SERVER_VERSION: "17rc1"
+    TAGS: "${DOCKER_NAME}:${PG_SERVER_VERSION},${DOCKER_NAME}:${PG_SERVER_VERSION}-${CI_COMMIT_TAG}"
+
 build-extended-postgres-9-6-image-feature:
   <<: *build_image_definition_gl
   <<: *only_feature
@@ -173,3 +181,11 @@ build-extended-postgres-16-image-feature:
     <<: *extended_image_vars_gl
     PG_SERVER_VERSION: "16"
     TAGS: "${DOCKER_NAME}:${PG_SERVER_VERSION},${DOCKER_NAME}:${PG_SERVER_VERSION}-${CI_COMMIT_REF_SLUG}"
+
+build-extended-postgres-17-image-feature:
+  <<: *build_image_definition_gl
+  <<: *only_feature
+  variables:
+    <<: *extended_image_vars_gl
+    PG_SERVER_VERSION: "17rc1"
+    TAGS: "${DOCKER_NAME}:${PG_SERVER_VERSION},${DOCKER_NAME}:${PG_SERVER_VERSION}-${CI_COMMIT_REF_SLUG}"