From 8d2a1e78c99749a2cd0f2508a81a9942434c47b9 Mon Sep 17 00:00:00 2001 From: "David E. Wheeler" Date: Thu, 12 Dec 2024 18:32:10 -0500 Subject: [PATCH] Update remaining core extensions to Postgres 17 (#838) Some have new versions, either from their control files or from Postgres itself, so adjust accordingly. Simplify the build scripting to shallowly clone the Postgres repo at the release tag, skip configuring Postgres, and use `make USE_PGXS=1` to install to the proper locations for the system Postgres, rather than the `/usr/local` default from configuring Postgres, eliminating the need for `mv`s in the install command. The exception to the above is the procedural languages, which do not support `USE_PGXS=1`. In those cases, configure postgres but specify the same SHAREDIR and PKGLIBDIR as the system Postgres. This technique does require overwriting the `Makefile` for each of the SPI extensions, but it's quite simple, a short `printf` statement for each. --- cli/Cargo.toml | 2 +- contrib/amcheck/Dockerfile | 20 +++++++------------- contrib/amcheck/Trunk.toml | 11 +++-------- contrib/auth_delay/Dockerfile | 23 +++++++++-------------- contrib/auth_delay/Trunk.toml | 12 +++--------- contrib/autoinc/Dockerfile | 23 +++++++++-------------- contrib/autoinc/Trunk.toml | 8 +------- contrib/basebackup_to_shell/Dockerfile | 21 ++++++++------------- contrib/basebackup_to_shell/Trunk.toml | 12 +++--------- contrib/basic_archive/Dockerfile | 20 +++++++------------- contrib/basic_archive/Trunk.toml | 12 +++--------- contrib/insert_username/Dockerfile | 22 +++++++++------------- contrib/insert_username/Trunk.toml | 9 ++------- contrib/intagg/Dockerfile | 20 +++++++------------- contrib/intagg/Trunk.toml | 9 ++------- contrib/intarray/Dockerfile | 20 +++++++------------- contrib/intarray/Trunk.toml | 9 ++------- contrib/isn/Dockerfile | 20 +++++++------------- contrib/isn/Trunk.toml | 9 ++------- contrib/jsonb_plperl/Dockerfile | 23 ++++++++--------------- contrib/jsonb_plperl/Trunk.toml | 12 ++++-------- contrib/jsonb_plperlu/Dockerfile | 23 ++++++++--------------- contrib/jsonb_plperlu/Trunk.toml | 10 ++++------ contrib/lo/Dockerfile | 20 +++++++------------- contrib/lo/Trunk.toml | 9 ++------- contrib/moddatetime/Dockerfile | 22 +++++++++------------- contrib/moddatetime/Trunk.toml | 9 ++------- contrib/old_snapshot/Dockerfile | 20 +++++++------------- contrib/old_snapshot/Trunk.toml | 9 ++------- contrib/pageinspect/Dockerfile | 20 +++++++------------- contrib/pageinspect/Trunk.toml | 9 ++------- contrib/passwordcheck/Dockerfile | 20 +++++++------------- contrib/passwordcheck/Trunk.toml | 12 +++--------- contrib/pg_buffercache/Dockerfile | 20 +++++++------------- contrib/pg_buffercache/Trunk.toml | 9 ++------- contrib/pg_freespacemap/Dockerfile | 20 +++++++------------- contrib/pg_freespacemap/Trunk.toml | 9 ++------- contrib/pg_prewarm/Dockerfile | 20 +++++++------------- contrib/pg_prewarm/Trunk.toml | 9 ++------- contrib/pg_stat_statements/Dockerfile | 20 +++++++------------- contrib/pg_stat_statements/Trunk.toml | 11 +++-------- contrib/pg_surgery/Dockerfile | 20 +++++++------------- contrib/pg_surgery/Trunk.toml | 9 ++------- contrib/pg_trgm/Dockerfile | 20 +++++++------------- contrib/pg_trgm/Trunk.toml | 10 ++-------- contrib/pg_visibility/Dockerfile | 20 +++++++------------- contrib/pg_visibility/Trunk.toml | 9 ++------- contrib/pg_walinspect/Dockerfile | 20 +++++++------------- contrib/pg_walinspect/Trunk.toml | 9 ++------- contrib/pgcrypto/Dockerfile | 20 +++++++------------- contrib/pgcrypto/Trunk.toml | 9 ++------- contrib/pgrowlocks/Dockerfile | 20 +++++++------------- contrib/pgrowlocks/Trunk.toml | 9 ++------- contrib/pgstattuple/Dockerfile | 20 +++++++------------- contrib/pgstattuple/Trunk.toml | 9 ++------- contrib/plperl/Dockerfile | 21 ++++++++------------- contrib/plperl/Trunk.toml | 9 ++------- contrib/plperlu/Dockerfile | 21 ++++++++------------- contrib/plperlu/Trunk.toml | 7 ++----- contrib/plpgsql/Dockerfile | 21 ++++++++------------- contrib/plpgsql/Trunk.toml | 10 ++-------- contrib/pltcl/Dockerfile | 21 ++++++++------------- contrib/pltcl/Trunk.toml | 9 +++------ contrib/pltclu/Dockerfile | 21 ++++++++------------- contrib/pltclu/Trunk.toml | 8 +++----- contrib/refint/Dockerfile | 22 +++++++++------------- contrib/refint/Trunk.toml | 9 ++------- contrib/seg/Dockerfile | 20 +++++++------------- contrib/seg/Trunk.toml | 9 ++------- contrib/sepgsql/Dockerfile | 23 +++++++++-------------- contrib/sepgsql/Trunk.toml | 12 +++--------- contrib/sslinfo/Dockerfile | 23 +++++++++-------------- contrib/sslinfo/Trunk.toml | 9 ++------- contrib/tablefunc/Dockerfile | 20 +++++++------------- contrib/tablefunc/Trunk.toml | 9 ++------- contrib/tcn/Dockerfile | 20 +++++++------------- contrib/tcn/Trunk.toml | 9 ++------- contrib/test_decoding/Dockerfile | 20 +++++++------------- contrib/test_decoding/Trunk.toml | 11 +++-------- contrib/tsm_system_rows/Dockerfile | 20 +++++++------------- contrib/tsm_system_rows/Trunk.toml | 9 ++------- contrib/tsm_system_time/Dockerfile | 20 +++++++------------- contrib/tsm_system_time/Trunk.toml | 9 ++------- contrib/uuid_ossp/Dockerfile | 20 +++++++------------- contrib/uuid_ossp/Trunk.toml | 9 ++------- contrib/xml2/Dockerfile | 20 +++++++------------- contrib/xml2/Trunk.toml | 9 ++------- 87 files changed, 423 insertions(+), 879 deletions(-) diff --git a/cli/Cargo.toml b/cli/Cargo.toml index 08a3b4ec..10cf672e 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "pg-trunk" -version = "0.15.3" +version = "0.15.4" edition = "2021" authors = ["Ian Stanton", "Vinícius Miguel"] description = "A package manager for PostgreSQL extensions" diff --git a/contrib/amcheck/Dockerfile b/contrib/amcheck/Dockerfile index 46cc0266..e07ddab9 100644 --- a/contrib/amcheck/Dockerfile +++ b/contrib/amcheck/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/amcheck && \ - make +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/amcheck/Trunk.toml b/contrib/amcheck/Trunk.toml index ce741b63..aa8c85aa 100644 --- a/contrib/amcheck/Trunk.toml +++ b/contrib/amcheck/Trunk.toml @@ -1,6 +1,6 @@ [extension] name = "amcheck" -version = "1.3.0" +version = "1.4.0" repository = "https://github.com/postgres/postgres/tree/master/contrib/amcheck" license = "PostgreSQL" description = "The amcheck module provides functions that allow you to verify the logical consistency of the structure of relations." @@ -12,12 +12,7 @@ categories = ["index_table_optimizations"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/amcheck && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ +install_command = "make -C postgres/contrib/amcheck install USE_PGXS=1" diff --git a/contrib/auth_delay/Dockerfile b/contrib/auth_delay/Dockerfile index b4a4229a..c383c657 100644 --- a/contrib/auth_delay/Dockerfile +++ b/contrib/auth_delay/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -13,16 +13,11 @@ RUN apt-get update && apt-get install -y \ libssl-dev \ libxml2-utils \ xsltproc \ - ccache - -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 + ccache \ + libkrb5-dev -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/auth_delay && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/auth_delay/Trunk.toml b/contrib/auth_delay/Trunk.toml index 96be289d..6f9c3fd8 100644 --- a/contrib/auth_delay/Trunk.toml +++ b/contrib/auth_delay/Trunk.toml @@ -1,6 +1,6 @@ [extension] name = "auth_delay" -version = "15.3.0" +version = "17.2.0" repository = "https://github.com/postgres/postgres/tree/master/contrib/auth_delay" license = "PostgreSQL" description = "auth_delay causes the server to pause briefly before reporting authentication failure, to make brute-force attacks on database passwords more difficult." @@ -10,13 +10,7 @@ categories = ["security"] loadable_libraries = [{ library_name = "auth_delay", requires_restart = true }] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/auth_delay && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ - +install_command = "make -C postgres/contrib/auth_delay install USE_PGXS=1" diff --git a/contrib/autoinc/Dockerfile b/contrib/autoinc/Dockerfile index b32f6c52..d4260b1c 100644 --- a/contrib/autoinc/Dockerfile +++ b/contrib/autoinc/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=17 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,15 +15,10 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_17_2 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/spi && \ - make - +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && printf "MODULES = autoinc\nEXTENSION = autoinc\nDATA = \$(wildcard autoinc--*.sql)\nPG_CONFIG ?= pg_config\nPGXS := \$(shell \$(PG_CONFIG) --pgxs)\ninclude \$(PGXS)\n" > postgres/contrib/spi/Makefile \ + && cat postgres/contrib/spi/Makefile \ + && make -C postgres/contrib/spi USE_PGXS=1 diff --git a/contrib/autoinc/Trunk.toml b/contrib/autoinc/Trunk.toml index 0b9e7b5f..62bb9970 100644 --- a/contrib/autoinc/Trunk.toml +++ b/contrib/autoinc/Trunk.toml @@ -15,10 +15,4 @@ apt = ["libc6"] postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/spi && make install - set -x - mv /usr/local/pgsql/share/extension/autoinc* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/autoinc* /usr/lib/postgresql/15/lib - """ - +install_command = "make -C postgres/contrib/spi install USE_PGXS=1" diff --git a/contrib/basebackup_to_shell/Dockerfile b/contrib/basebackup_to_shell/Dockerfile index 1c4f7762..e496b2c1 100644 --- a/contrib/basebackup_to_shell/Dockerfile +++ b/contrib/basebackup_to_shell/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,9 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/basebackup_to_shell && \ - make +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && (cd postgres && ./configure --datarootdir "$(pg_config --sharedir)" --libdir "$(pg_config --pkglibdir)") \ + && make -C postgres/contrib/${EXTENSION_NAME} diff --git a/contrib/basebackup_to_shell/Trunk.toml b/contrib/basebackup_to_shell/Trunk.toml index c475797c..026b376d 100644 --- a/contrib/basebackup_to_shell/Trunk.toml +++ b/contrib/basebackup_to_shell/Trunk.toml @@ -1,6 +1,6 @@ [extension] name = "basebackup_to_shell" -version = "15.3.0" +version = "17.2.0" repository = "https://github.com/postgres/postgres/tree/master/contrib/basebackup_to_shell" license = "PostgreSQL" description = "basebackup_to_shell adds a custom basebackup target called shell." @@ -13,13 +13,7 @@ loadable_libraries = [{ library_name = "basebackup_to_shell", requires_restart = apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/basebackup_to_shell && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ - +install_command = "make -C postgres/contrib/basebackup_to_shell install" diff --git a/contrib/basic_archive/Dockerfile b/contrib/basic_archive/Dockerfile index 72803084..25326f76 100644 --- a/contrib/basic_archive/Dockerfile +++ b/contrib/basic_archive/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION=17 FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/basic_archive && \ - make +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/basic_archive/Trunk.toml b/contrib/basic_archive/Trunk.toml index 32642d5d..e1b6164c 100644 --- a/contrib/basic_archive/Trunk.toml +++ b/contrib/basic_archive/Trunk.toml @@ -1,6 +1,6 @@ [extension] name = "basic_archive" -version = "15.3.0" +version = "17.2.0" repository = "https://github.com/postgres/postgres/tree/master/contrib/basic_archive" license = "PostgreSQL" description = "This module copies completed WAL segment files to the specified directory." @@ -13,13 +13,7 @@ loadable_libraries = [{ library_name = "basic_archive", requires_restart = true apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/basic_archive && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ - +install_command = "make -C postgres/contrib/basic_archive install USE_PGXS=1" diff --git a/contrib/insert_username/Dockerfile b/contrib/insert_username/Dockerfile index 53519e9e..d807d371 100644 --- a/contrib/insert_username/Dockerfile +++ b/contrib/insert_username/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,10 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/spi && \ - make +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && printf "MODULES = insert_username\nEXTENSION = insert_username\nDATA = \$(wildcard insert_username--*.sql)\nPG_CONFIG ?= pg_config\nPGXS := \$(shell \$(PG_CONFIG) --pgxs)\ninclude \$(PGXS)\n" > postgres/contrib/spi/Makefile \ + && cat postgres/contrib/spi/Makefile \ + && make -C postgres/contrib/spi USE_PGXS=1 diff --git a/contrib/insert_username/Trunk.toml b/contrib/insert_username/Trunk.toml index c6f5d86c..fd71283b 100644 --- a/contrib/insert_username/Trunk.toml +++ b/contrib/insert_username/Trunk.toml @@ -13,12 +13,7 @@ categories = ["auditing_logging"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/spi && make install - set -x - mv /usr/local/pgsql/share/extension/insert_username* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/insert_username* /usr/lib/postgresql/15/lib - """ +install_command = "make -C postgres/contrib/spi install USE_PGXS=1" diff --git a/contrib/intagg/Dockerfile b/contrib/intagg/Dockerfile index ff21fd65..e07ddab9 100644 --- a/contrib/intagg/Dockerfile +++ b/contrib/intagg/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/intagg && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/intagg/Trunk.toml b/contrib/intagg/Trunk.toml index 8ea7667c..40a9bbfa 100644 --- a/contrib/intagg/Trunk.toml +++ b/contrib/intagg/Trunk.toml @@ -9,12 +9,7 @@ documentation = "https://www.postgresql.org/docs/current/intagg.html" categories = ["data_transformations"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/intagg && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ \ No newline at end of file +install_command = "make -C postgres/contrib/intagg install USE_PGXS=1" diff --git a/contrib/intarray/Dockerfile b/contrib/intarray/Dockerfile index 2d65acee..e07ddab9 100644 --- a/contrib/intarray/Dockerfile +++ b/contrib/intarray/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/intarray && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/intarray/Trunk.toml b/contrib/intarray/Trunk.toml index ec1b1a8d..ef62bbfc 100644 --- a/contrib/intarray/Trunk.toml +++ b/contrib/intarray/Trunk.toml @@ -12,12 +12,7 @@ categories = ["data_transformations"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/intarray && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ +install_command = "make -C postgres/contrib/intarray install USE_PGXS=1" diff --git a/contrib/isn/Dockerfile b/contrib/isn/Dockerfile index 536eba4c..e07ddab9 100644 --- a/contrib/isn/Dockerfile +++ b/contrib/isn/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/isn && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/isn/Trunk.toml b/contrib/isn/Trunk.toml index 0694c3c9..05ba6019 100644 --- a/contrib/isn/Trunk.toml +++ b/contrib/isn/Trunk.toml @@ -12,12 +12,7 @@ categories = ["data_transformations"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/isn && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ +install_command = "make -C postgres/contrib/isn install USE_PGXS=1" diff --git a/contrib/jsonb_plperl/Dockerfile b/contrib/jsonb_plperl/Dockerfile index ea8d20fa..f0b1beb3 100644 --- a/contrib/jsonb_plperl/Dockerfile +++ b/contrib/jsonb_plperl/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -17,16 +17,9 @@ RUN apt-get update && apt-get install -y \ libperl-dev \ perl -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -# Set project version -ARG PG_RELEASE=REL_15_3 - -# Build extension -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure --with-perl && \ - cd contrib/jsonb_plperl && \ - make +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && (cd postgres && ./configure --with-perl --datarootdir "$(pg_config --sharedir)" --libdir "$(pg_config --pkglibdir)") \ + && make -C postgres/contrib/${EXTENSION_NAME} diff --git a/contrib/jsonb_plperl/Trunk.toml b/contrib/jsonb_plperl/Trunk.toml index 928cdb51..ba521d73 100644 --- a/contrib/jsonb_plperl/Trunk.toml +++ b/contrib/jsonb_plperl/Trunk.toml @@ -12,14 +12,10 @@ categories = ["data_transformations"] apt = ["libc6", "libperl5.34"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" install_command = """ - cd postgres/contrib/jsonb_plperl && make install - set -x - mv /usr/local/pgsql/share/extension/jsonb_plperl.* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/share/extension/jsonb_plperl--* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ - + make -C postgres/contrib/jsonb_plperl install + rm "$(pg_config --sharedir)"/extension/jsonb_plperlu{--*,.*} +""" diff --git a/contrib/jsonb_plperlu/Dockerfile b/contrib/jsonb_plperlu/Dockerfile index ea8d20fa..8d2cd785 100644 --- a/contrib/jsonb_plperlu/Dockerfile +++ b/contrib/jsonb_plperlu/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -17,16 +17,9 @@ RUN apt-get update && apt-get install -y \ libperl-dev \ perl -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -# Set project version -ARG PG_RELEASE=REL_15_3 - -# Build extension -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure --with-perl && \ - cd contrib/jsonb_plperl && \ - make +# Clone repository and build extension. +# ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && (cd postgres && ./configure --with-perl --datarootdir "$(pg_config --sharedir)" --libdir "$(pg_config --pkglibdir)") \ + && make -C postgres/contrib/jsonb_plperl diff --git a/contrib/jsonb_plperlu/Trunk.toml b/contrib/jsonb_plperlu/Trunk.toml index 0a1d65d0..d63e48e7 100644 --- a/contrib/jsonb_plperlu/Trunk.toml +++ b/contrib/jsonb_plperlu/Trunk.toml @@ -9,12 +9,10 @@ documentation = "https://www.postgresql.org/docs/current/datatype-json.html" categories = ["data_transformations"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" install_command = """ - cd postgres/contrib/jsonb_plperl && make install - set -x - mv /usr/local/pgsql/share/extension/jsonb_plperlu* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ + make -C postgres/contrib/jsonb_plperl install + rm "$(pg_config --sharedir)"/extension/jsonb_plperl{--*,.*} +""" diff --git a/contrib/lo/Dockerfile b/contrib/lo/Dockerfile index 9b857596..e07ddab9 100644 --- a/contrib/lo/Dockerfile +++ b/contrib/lo/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/lo && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/lo/Trunk.toml b/contrib/lo/Trunk.toml index e98b3601..f058b5d0 100644 --- a/contrib/lo/Trunk.toml +++ b/contrib/lo/Trunk.toml @@ -12,12 +12,7 @@ categories = ["data_transformations"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/lo && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ +install_command = "make -C postgres/contrib/lo install USE_PGXS=1" diff --git a/contrib/moddatetime/Dockerfile b/contrib/moddatetime/Dockerfile index 53519e9e..815e23cd 100644 --- a/contrib/moddatetime/Dockerfile +++ b/contrib/moddatetime/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,10 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/spi && \ - make +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && printf "MODULES = moddatetime\nEXTENSION = moddatetime\nDATA = \$(wildcard moddatetime--*.sql)\nPG_CONFIG ?= pg_config\nPGXS := \$(shell \$(PG_CONFIG) --pgxs)\ninclude \$(PGXS)\n" > postgres/contrib/spi/Makefile \ + && cat postgres/contrib/spi/Makefile \ + && make -C postgres/contrib/spi USE_PGXS=1 diff --git a/contrib/moddatetime/Trunk.toml b/contrib/moddatetime/Trunk.toml index 87d673c6..f1b7a487 100644 --- a/contrib/moddatetime/Trunk.toml +++ b/contrib/moddatetime/Trunk.toml @@ -12,12 +12,7 @@ categories = ["auditing_logging"] apt = ["libc6", "libpython3.10"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/spi && make install - set -x - mv /usr/local/pgsql/share/extension/moddatetime* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/moddatetime* /usr/lib/postgresql/15/lib - """ +install_command = "make -C postgres/contrib/spi install USE_PGXS=1" diff --git a/contrib/old_snapshot/Dockerfile b/contrib/old_snapshot/Dockerfile index a3bdc34d..e07ddab9 100644 --- a/contrib/old_snapshot/Dockerfile +++ b/contrib/old_snapshot/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/old_snapshot && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/old_snapshot/Trunk.toml b/contrib/old_snapshot/Trunk.toml index 1b660d00..4c270be2 100644 --- a/contrib/old_snapshot/Trunk.toml +++ b/contrib/old_snapshot/Trunk.toml @@ -12,12 +12,7 @@ categories = ["metrics"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/old_snapshot && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ +install_command = "make -C postgres/contrib/old_snapshot install USE_PGXS=1" diff --git a/contrib/pageinspect/Dockerfile b/contrib/pageinspect/Dockerfile index 81384fb9..e07ddab9 100644 --- a/contrib/pageinspect/Dockerfile +++ b/contrib/pageinspect/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/pageinspect && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/pageinspect/Trunk.toml b/contrib/pageinspect/Trunk.toml index 497ad425..495f7e2c 100644 --- a/contrib/pageinspect/Trunk.toml +++ b/contrib/pageinspect/Trunk.toml @@ -12,12 +12,7 @@ categories = ["metrics"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/pageinspect && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ +install_command = "make -C postgres/contrib/pageinspect install USE_PGXS=1" diff --git a/contrib/passwordcheck/Dockerfile b/contrib/passwordcheck/Dockerfile index 6221f019..e07ddab9 100644 --- a/contrib/passwordcheck/Dockerfile +++ b/contrib/passwordcheck/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/passwordcheck && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/passwordcheck/Trunk.toml b/contrib/passwordcheck/Trunk.toml index 933b0118..8e9ba181 100644 --- a/contrib/passwordcheck/Trunk.toml +++ b/contrib/passwordcheck/Trunk.toml @@ -1,6 +1,6 @@ [extension] name = "passwordcheck" -version = "15.3.0" +version = "17.2.0" repository = "https://github.com/postgres/postgres/tree/master/contrib/passwordcheck" license = "PostgreSQL" description = "The passwordcheck module checks users' passwords whenever they are set with CREATE ROLE or ALTER ROLE." @@ -13,13 +13,7 @@ loadable_libraries = [{ library_name = "passwordcheck", requires_restart = true apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/passwordcheck && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ - +install_command = "make -C postgres/contrib/passwordcheck install USE_PGXS=1" diff --git a/contrib/pg_buffercache/Dockerfile b/contrib/pg_buffercache/Dockerfile index 0e9848f3..e07ddab9 100644 --- a/contrib/pg_buffercache/Dockerfile +++ b/contrib/pg_buffercache/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/pg_buffercache && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/pg_buffercache/Trunk.toml b/contrib/pg_buffercache/Trunk.toml index e563cf3d..1f4ef448 100644 --- a/contrib/pg_buffercache/Trunk.toml +++ b/contrib/pg_buffercache/Trunk.toml @@ -13,12 +13,7 @@ categories = ["metrics"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/pg_buffercache && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ +install_command = "make -C postgres/contrib/pg_buffercache install USE_PGXS=1" diff --git a/contrib/pg_freespacemap/Dockerfile b/contrib/pg_freespacemap/Dockerfile index 31b416f2..e07ddab9 100644 --- a/contrib/pg_freespacemap/Dockerfile +++ b/contrib/pg_freespacemap/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/pg_freespacemap && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/pg_freespacemap/Trunk.toml b/contrib/pg_freespacemap/Trunk.toml index 67dce6a8..593e8058 100644 --- a/contrib/pg_freespacemap/Trunk.toml +++ b/contrib/pg_freespacemap/Trunk.toml @@ -9,12 +9,7 @@ documentation = "https://www.postgresql.org/docs/current/pgfreespacemap.html" categories = ["metrics"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/pg_freespacemap && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ \ No newline at end of file +install_command = "make -C postgres/contrib/pg_freespacemap install USE_PGXS=1" diff --git a/contrib/pg_prewarm/Dockerfile b/contrib/pg_prewarm/Dockerfile index 11b838fb..e07ddab9 100644 --- a/contrib/pg_prewarm/Dockerfile +++ b/contrib/pg_prewarm/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/pg_prewarm && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/pg_prewarm/Trunk.toml b/contrib/pg_prewarm/Trunk.toml index 099879f6..50dd947a 100644 --- a/contrib/pg_prewarm/Trunk.toml +++ b/contrib/pg_prewarm/Trunk.toml @@ -13,12 +13,7 @@ preload_libraries = ["pg_prewarm"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/pg_prewarm && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ +install_command = "make -C postgres/contrib/pg_prewarm install USE_PGXS=1" diff --git a/contrib/pg_stat_statements/Dockerfile b/contrib/pg_stat_statements/Dockerfile index c6e3a6cd..dd92eb18 100644 --- a/contrib/pg_stat_statements/Dockerfile +++ b/contrib/pg_stat_statements/Dockerfile @@ -1,9 +1,9 @@ # Set up variables for build. -ARG PG_VERSION=17 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -16,14 +16,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/pg_stat_statements && \ - make +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/pg_stat_statements/Trunk.toml b/contrib/pg_stat_statements/Trunk.toml index 5ae1976a..80e74de8 100644 --- a/contrib/pg_stat_statements/Trunk.toml +++ b/contrib/pg_stat_statements/Trunk.toml @@ -1,6 +1,6 @@ [extension] name = "pg_stat_statements" -version = "1.10.0" +version = "1.11.0" repository = "https://github.com/postgres/postgres/tree/master/contrib/pg_stat_statements" license = "PostgreSQL" description = "The pg_stat_statements module provides a means for tracking planning and execution statistics of all SQL statements executed by a server." @@ -12,12 +12,7 @@ categories = ["featured", "metrics"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/pg_stat_statements && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ \ No newline at end of file +install_command = "make -C postgres/contrib/pg_stat_statements install USE_PGXS=1" diff --git a/contrib/pg_surgery/Dockerfile b/contrib/pg_surgery/Dockerfile index bb03a620..e07ddab9 100644 --- a/contrib/pg_surgery/Dockerfile +++ b/contrib/pg_surgery/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/pg_surgery && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/pg_surgery/Trunk.toml b/contrib/pg_surgery/Trunk.toml index d1480327..e3aa9239 100644 --- a/contrib/pg_surgery/Trunk.toml +++ b/contrib/pg_surgery/Trunk.toml @@ -12,12 +12,7 @@ categories = ["debugging"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/pg_surgery && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ \ No newline at end of file +install_command = "make -C postgres/contrib/pg_surgery install USE_PGXS=1" diff --git a/contrib/pg_trgm/Dockerfile b/contrib/pg_trgm/Dockerfile index eef7486e..e07ddab9 100644 --- a/contrib/pg_trgm/Dockerfile +++ b/contrib/pg_trgm/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/pg_trgm && \ - make +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/pg_trgm/Trunk.toml b/contrib/pg_trgm/Trunk.toml index 5070ed7f..c3d5cad9 100644 --- a/contrib/pg_trgm/Trunk.toml +++ b/contrib/pg_trgm/Trunk.toml @@ -12,13 +12,7 @@ categories = ["search"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/pg_trgm && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ - +install_command = "make -C postgres/contrib/pg_trgm install USE_PGXS=1" diff --git a/contrib/pg_visibility/Dockerfile b/contrib/pg_visibility/Dockerfile index 9d822dc7..e07ddab9 100644 --- a/contrib/pg_visibility/Dockerfile +++ b/contrib/pg_visibility/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/pg_visibility && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/pg_visibility/Trunk.toml b/contrib/pg_visibility/Trunk.toml index 0107f490..624ae12d 100644 --- a/contrib/pg_visibility/Trunk.toml +++ b/contrib/pg_visibility/Trunk.toml @@ -12,12 +12,7 @@ categories = ["metrics"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/pg_visibility && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ \ No newline at end of file +install_command = "make -C postgres/contrib/pg_visibility install USE_PGXS=1" diff --git a/contrib/pg_walinspect/Dockerfile b/contrib/pg_walinspect/Dockerfile index fb0603fd..e07ddab9 100644 --- a/contrib/pg_walinspect/Dockerfile +++ b/contrib/pg_walinspect/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/pg_walinspect && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/pg_walinspect/Trunk.toml b/contrib/pg_walinspect/Trunk.toml index 8e79eb81..2026b681 100644 --- a/contrib/pg_walinspect/Trunk.toml +++ b/contrib/pg_walinspect/Trunk.toml @@ -13,12 +13,7 @@ categories = ["metrics"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/pg_walinspect && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ \ No newline at end of file +install_command = "make -C postgres/contrib/pg_walinspect install USE_PGXS=1" diff --git a/contrib/pgcrypto/Dockerfile b/contrib/pgcrypto/Dockerfile index f285841b..e07ddab9 100644 --- a/contrib/pgcrypto/Dockerfile +++ b/contrib/pgcrypto/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/pgcrypto && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/pgcrypto/Trunk.toml b/contrib/pgcrypto/Trunk.toml index aebe12c9..f4caa2fd 100644 --- a/contrib/pgcrypto/Trunk.toml +++ b/contrib/pgcrypto/Trunk.toml @@ -12,12 +12,7 @@ categories = ["security"] apt = ["zlib1g", "libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/pgcrypto && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ +install_command = "make -C postgres/contrib/pgcrypto install USE_PGXS=1" diff --git a/contrib/pgrowlocks/Dockerfile b/contrib/pgrowlocks/Dockerfile index c99fe680..e07ddab9 100644 --- a/contrib/pgrowlocks/Dockerfile +++ b/contrib/pgrowlocks/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/pgrowlocks && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/pgrowlocks/Trunk.toml b/contrib/pgrowlocks/Trunk.toml index c147af71..5a3143a3 100644 --- a/contrib/pgrowlocks/Trunk.toml +++ b/contrib/pgrowlocks/Trunk.toml @@ -12,12 +12,7 @@ categories = ["metrics"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/pgrowlocks && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ +install_command = "make -C postgres/contrib/pgrowlocks install USE_PGXS=1" diff --git a/contrib/pgstattuple/Dockerfile b/contrib/pgstattuple/Dockerfile index 5e9d139f..e07ddab9 100644 --- a/contrib/pgstattuple/Dockerfile +++ b/contrib/pgstattuple/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/pgstattuple && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/pgstattuple/Trunk.toml b/contrib/pgstattuple/Trunk.toml index f401d7d2..fc3021d3 100644 --- a/contrib/pgstattuple/Trunk.toml +++ b/contrib/pgstattuple/Trunk.toml @@ -12,12 +12,7 @@ categories = ["metrics"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/pgstattuple && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ \ No newline at end of file +install_command = "make -C postgres/contrib/pgstattuple install USE_PGXS=1" diff --git a/contrib/plperl/Dockerfile b/contrib/plperl/Dockerfile index ce492694..4c0e4f4c 100644 --- a/contrib/plperl/Dockerfile +++ b/contrib/plperl/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -18,14 +18,9 @@ RUN apt-get update && apt-get install -y \ libperl-dev \ perl -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure --with-perl && \ - cd src/pl/plperl && \ - make +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && (cd postgres && ./configure --with-perl --datarootdir "$(pg_config --sharedir)" --libdir "$(pg_config --pkglibdir)") \ + && make -C postgres/src/pl/${EXTENSION_NAME} diff --git a/contrib/plperl/Trunk.toml b/contrib/plperl/Trunk.toml index 9748cb11..9447ee93 100644 --- a/contrib/plperl/Trunk.toml +++ b/contrib/plperl/Trunk.toml @@ -12,15 +12,10 @@ categories = ["procedural_languages"] apt = ["libc6", "libperl5.34"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" install_command = """ make -C postgres/src/pl/plperl install - set -x - mv /usr/local/pgsql/share/extension/plperl.* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/share/extension/plperl--* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/plperl.* /usr/lib/postgresql/15/lib - mv /usr/local/pgsql/lib/plperl--* /usr/lib/postgresql/15/lib + rm "$(pg_config --sharedir)"/extension/plperlu{--*,.*} """ - diff --git a/contrib/plperlu/Dockerfile b/contrib/plperlu/Dockerfile index ce492694..4603eb04 100644 --- a/contrib/plperlu/Dockerfile +++ b/contrib/plperlu/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -18,14 +18,9 @@ RUN apt-get update && apt-get install -y \ libperl-dev \ perl -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure --with-perl && \ - cd src/pl/plperl && \ - make +# Clone repository and build extension. +# ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && (cd postgres && ./configure --with-perl --datarootdir "$(pg_config --sharedir)" --libdir "$(pg_config --pkglibdir)") \ + && make -C postgres/src/pl/plperl diff --git a/contrib/plperlu/Trunk.toml b/contrib/plperlu/Trunk.toml index c1e32eef..e3c0c306 100644 --- a/contrib/plperlu/Trunk.toml +++ b/contrib/plperlu/Trunk.toml @@ -12,13 +12,10 @@ categories = ["procedural_languages"] apt = ["libc6", "libperl5.34"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" install_command = """ make -C postgres/src/pl/plperl install - set -x - mv /usr/local/pgsql/share/extension/plperlu* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/plperl* /usr/lib/postgresql/15/lib + rm "$(pg_config --sharedir)"/extension/plperl{--*,.*} """ - diff --git a/contrib/plpgsql/Dockerfile b/contrib/plpgsql/Dockerfile index 6ef063ce..6fe8c9a1 100644 --- a/contrib/plpgsql/Dockerfile +++ b/contrib/plpgsql/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -16,14 +16,9 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd src/pl/plpgsql && \ - make +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && (cd postgres && ./configure --datarootdir "$(pg_config --sharedir)" --libdir "$(pg_config --pkglibdir)") \ + && make -C postgres/src/pl/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/plpgsql/Trunk.toml b/contrib/plpgsql/Trunk.toml index 7bd26ec6..c9f37b59 100644 --- a/contrib/plpgsql/Trunk.toml +++ b/contrib/plpgsql/Trunk.toml @@ -12,13 +12,7 @@ categories = ["procedural_languages"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - make -C postgres/src/pl/plpgsql install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib -""" - +install_command = "make -C postgres/src/pl/plpgsql install" diff --git a/contrib/pltcl/Dockerfile b/contrib/pltcl/Dockerfile index 564cdcbf..905fb702 100644 --- a/contrib/pltcl/Dockerfile +++ b/contrib/pltcl/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -17,14 +17,9 @@ RUN apt-get update && apt-get install -y \ ccache \ tcl-dev -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure --with-tcl && \ - cd src/pl/tcl && \ - make +# Clone repository and build extension. +# ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && (cd postgres && ./configure --with-tcl --datarootdir "$(pg_config --sharedir)" --libdir "$(pg_config --pkglibdir)") \ + && make -C postgres/src/pl/tcl diff --git a/contrib/pltcl/Trunk.toml b/contrib/pltcl/Trunk.toml index ba41af40..37546422 100644 --- a/contrib/pltcl/Trunk.toml +++ b/contrib/pltcl/Trunk.toml @@ -1,6 +1,7 @@ [extension] name = "pltcl" version = "1.0.0" +license = "PostgreSQL" repository = "https://github.com/postgres/postgres/tree/master/src/pl/tcl" description = "The PL/Tcl procedural language for PostgreSQL." homepage = "https://www.postgresql.org" @@ -11,14 +12,10 @@ categories = ["procedural_languages"] apt = ["libtcl8.6.so", "libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" install_command = """ make -C postgres/src/pl/tcl install - set -x - mv /usr/local/pgsql/share/extension/pltcl.* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/share/extension/pltcl--* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/pltcl* /usr/lib/postgresql/15/lib + rm "$(pg_config --sharedir)"/extension/pltclu{--*,.*} """ - diff --git a/contrib/pltclu/Dockerfile b/contrib/pltclu/Dockerfile index 564cdcbf..905fb702 100644 --- a/contrib/pltclu/Dockerfile +++ b/contrib/pltclu/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -17,14 +17,9 @@ RUN apt-get update && apt-get install -y \ ccache \ tcl-dev -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure --with-tcl && \ - cd src/pl/tcl && \ - make +# Clone repository and build extension. +# ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && (cd postgres && ./configure --with-tcl --datarootdir "$(pg_config --sharedir)" --libdir "$(pg_config --pkglibdir)") \ + && make -C postgres/src/pl/tcl diff --git a/contrib/pltclu/Trunk.toml b/contrib/pltclu/Trunk.toml index cd38bc6c..323c4bf6 100644 --- a/contrib/pltclu/Trunk.toml +++ b/contrib/pltclu/Trunk.toml @@ -1,6 +1,7 @@ [extension] name = "pltclu" version = "1.0.0" +license = "PostgreSQL" repository = "https://github.com/postgres/postgres/tree/master/src/pl/tcl" description = "The PL/Tclu procedural language for PostgreSQL." homepage = "https://www.postgresql.org" @@ -11,13 +12,10 @@ categories = ["procedural_languages"] apt = ["libtcl8.6.so", "libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" install_command = """ make -C postgres/src/pl/tcl install - set -x - mv /usr/local/pgsql/share/extension/pltclu* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/pltcl* /usr/lib/postgresql/15/lib + rm "$(pg_config --sharedir)"/extension/pltcl{--*,.*} """ - diff --git a/contrib/refint/Dockerfile b/contrib/refint/Dockerfile index 53519e9e..91e9d360 100644 --- a/contrib/refint/Dockerfile +++ b/contrib/refint/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,10 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/spi && \ - make +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && printf "MODULES = refint\nEXTENSION = refint\nDATA = \$(wildcard refint--*.sql)\nPG_CONFIG ?= pg_config\nPGXS := \$(shell \$(PG_CONFIG) --pgxs)\ninclude \$(PGXS)\n" > postgres/contrib/spi/Makefile \ + && cat postgres/contrib/spi/Makefile \ + && make -C postgres/contrib/spi USE_PGXS=1 diff --git a/contrib/refint/Trunk.toml b/contrib/refint/Trunk.toml index a33daaca..4d1122ca 100644 --- a/contrib/refint/Trunk.toml +++ b/contrib/refint/Trunk.toml @@ -12,12 +12,7 @@ categories = ["tooling_admin"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/spi && make install - set -x - mv /usr/local/pgsql/share/extension/refint* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/refint* /usr/lib/postgresql/15/lib - """ +install_command = "make -C postgres/contrib/spi install USE_PGXS=1" diff --git a/contrib/seg/Dockerfile b/contrib/seg/Dockerfile index b7b3d02f..e07ddab9 100644 --- a/contrib/seg/Dockerfile +++ b/contrib/seg/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/seg && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/seg/Trunk.toml b/contrib/seg/Trunk.toml index 1b4d7f61..e14667e8 100644 --- a/contrib/seg/Trunk.toml +++ b/contrib/seg/Trunk.toml @@ -12,12 +12,7 @@ categories = ["data_transformations"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/seg && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ \ No newline at end of file +install_command = "make -C postgres/contrib/seg install USE_PGXS=1" diff --git a/contrib/sepgsql/Dockerfile b/contrib/sepgsql/Dockerfile index 67df9843..27ff3299 100644 --- a/contrib/sepgsql/Dockerfile +++ b/contrib/sepgsql/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -14,16 +14,11 @@ RUN apt-get update && apt-get install -y \ libxml2-utils \ xsltproc \ ccache \ - libselinux1-dev - -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 + libselinux1-dev \ + libkrb5-dev -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/sepgsql && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/sepgsql/Trunk.toml b/contrib/sepgsql/Trunk.toml index a480c992..869d93ab 100644 --- a/contrib/sepgsql/Trunk.toml +++ b/contrib/sepgsql/Trunk.toml @@ -1,6 +1,6 @@ [extension] name = "sepgsql" -version = "15.3.0" +version = "17.3.0" repository = "https://github.com/postgres/postgres/tree/master/contrib/sepgsql" license = "PostgreSQL" description = "sepgsql is a loadable module that supports label-based mandatory access control (MAC) based on SELinux security policy." @@ -13,13 +13,7 @@ loadable_libraries = [{ library_name = "sepgsql", requires_restart = true }] apt = ["libselinux1", "libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/sepgsql && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ - +install_command = "make -C postgres/contrib/sepgsql install USE_PGXS=1" diff --git a/contrib/sslinfo/Dockerfile b/contrib/sslinfo/Dockerfile index ab7b892c..c383c657 100644 --- a/contrib/sslinfo/Dockerfile +++ b/contrib/sslinfo/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -13,16 +13,11 @@ RUN apt-get update && apt-get install -y \ libssl-dev \ libxml2-utils \ xsltproc \ - ccache - -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 + ccache \ + libkrb5-dev -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure --with-openssl && \ - cd contrib/sslinfo && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/sslinfo/Trunk.toml b/contrib/sslinfo/Trunk.toml index 2411ed89..748c08ac 100644 --- a/contrib/sslinfo/Trunk.toml +++ b/contrib/sslinfo/Trunk.toml @@ -13,12 +13,7 @@ categories = ["security"] apt = ["libc6", "openssl"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/sslinfo && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ \ No newline at end of file +install_command = "make -C postgres/contrib/sslinfo install USE_PGXS=1" diff --git a/contrib/tablefunc/Dockerfile b/contrib/tablefunc/Dockerfile index e187f44b..e07ddab9 100644 --- a/contrib/tablefunc/Dockerfile +++ b/contrib/tablefunc/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/tablefunc && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/tablefunc/Trunk.toml b/contrib/tablefunc/Trunk.toml index b0949f36..9d07be1b 100644 --- a/contrib/tablefunc/Trunk.toml +++ b/contrib/tablefunc/Trunk.toml @@ -12,12 +12,7 @@ categories = ["data_transformations"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/tablefunc && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ \ No newline at end of file +install_command = "make -C postgres/contrib/tablefunc install USE_PGXS=1" diff --git a/contrib/tcn/Dockerfile b/contrib/tcn/Dockerfile index b7ddaddc..e07ddab9 100644 --- a/contrib/tcn/Dockerfile +++ b/contrib/tcn/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/tcn && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/tcn/Trunk.toml b/contrib/tcn/Trunk.toml index 5fa001d9..67a448e2 100644 --- a/contrib/tcn/Trunk.toml +++ b/contrib/tcn/Trunk.toml @@ -9,12 +9,7 @@ documentation = "https://www.postgresql.org/docs/current/tcn.html" categories = ["auditing_logging"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/tcn && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ \ No newline at end of file +install_command = "make -C postgres/contrib/tcn install USE_PGXS=1" diff --git a/contrib/test_decoding/Dockerfile b/contrib/test_decoding/Dockerfile index ac45ada3..e07ddab9 100644 --- a/contrib/test_decoding/Dockerfile +++ b/contrib/test_decoding/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/test_decoding && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/test_decoding/Trunk.toml b/contrib/test_decoding/Trunk.toml index 63d7fe84..90fa58f8 100644 --- a/contrib/test_decoding/Trunk.toml +++ b/contrib/test_decoding/Trunk.toml @@ -1,6 +1,6 @@ [extension] name = "test_decoding" -version = "15.3.0" +version = "17.2.0" repository = "https://github.com/postgres/postgres/tree/master/contrib/test_decoding" license = "PostgreSQL" description = "test_decoding receives WAL through the logical decoding mechanism and decodes it into text representations of the operations performed." @@ -12,12 +12,7 @@ categories = ["change_data_capture"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/test_decoding && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ \ No newline at end of file +install_command = "make -C postgres/contrib/test_decoding install USE_PGXS=1" diff --git a/contrib/tsm_system_rows/Dockerfile b/contrib/tsm_system_rows/Dockerfile index a0fc0635..e07ddab9 100644 --- a/contrib/tsm_system_rows/Dockerfile +++ b/contrib/tsm_system_rows/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/tsm_system_rows && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/tsm_system_rows/Trunk.toml b/contrib/tsm_system_rows/Trunk.toml index 78ec7997..010e0d92 100644 --- a/contrib/tsm_system_rows/Trunk.toml +++ b/contrib/tsm_system_rows/Trunk.toml @@ -9,12 +9,7 @@ documentation = "https://www.postgresql.org/docs/current/tsm-system-rows.html" categories = ["data_transformations"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/tsm_system_rows && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ \ No newline at end of file +install_command = "make -C postgres/contrib/tsm_system_rows install USE_PGXS=1" diff --git a/contrib/tsm_system_time/Dockerfile b/contrib/tsm_system_time/Dockerfile index 3527612e..e07ddab9 100644 --- a/contrib/tsm_system_time/Dockerfile +++ b/contrib/tsm_system_time/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure && \ - cd contrib/tsm_system_time && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/tsm_system_time/Trunk.toml b/contrib/tsm_system_time/Trunk.toml index 08147cc9..d814f101 100644 --- a/contrib/tsm_system_time/Trunk.toml +++ b/contrib/tsm_system_time/Trunk.toml @@ -12,12 +12,7 @@ categories = ["data_transformations"] apt = ["libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/tsm_system_time && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ \ No newline at end of file +install_command = "make -C postgres/contrib/tsm_system_time install USE_PGXS=1" diff --git a/contrib/uuid_ossp/Dockerfile b/contrib/uuid_ossp/Dockerfile index cfd216ed..867ca46d 100644 --- a/contrib/uuid_ossp/Dockerfile +++ b/contrib/uuid_ossp/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -16,14 +16,8 @@ RUN apt-get update && apt-get install -y \ ccache \ uuid-dev -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure --with-uuid=e2fs && \ - cd contrib/uuid-ossp && \ - make \ No newline at end of file +# Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/uuid-ossp USE_PGXS=1 diff --git a/contrib/uuid_ossp/Trunk.toml b/contrib/uuid_ossp/Trunk.toml index de3e73bc..b69a55f1 100644 --- a/contrib/uuid_ossp/Trunk.toml +++ b/contrib/uuid_ossp/Trunk.toml @@ -12,12 +12,7 @@ categories = ["data_transformations"] apt = ["libuuid1", "libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/uuid-ossp && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ \ No newline at end of file +install_command = "make -C postgres/contrib/uuid-ossp install USE_PGXS=1" diff --git a/contrib/xml2/Dockerfile b/contrib/xml2/Dockerfile index f2349d7f..737e31e1 100644 --- a/contrib/xml2/Dockerfile +++ b/contrib/xml2/Dockerfile @@ -1,8 +1,8 @@ -ARG PG_VERSION=15 +ARG PG_VERSION FROM quay.io/coredb/c-builder:pg${PG_VERSION} -USER root # Extension build dependencies +USER root RUN apt-get update && apt-get install -y \ build-essential \ libreadline-dev \ @@ -15,14 +15,8 @@ RUN apt-get update && apt-get install -y \ xsltproc \ ccache -# Clone repository -RUN git clone https://github.com/postgres/postgres.git - -ARG PG_RELEASE=REL_15_3 - -RUN cd postgres && \ - git fetch origin ${PG_RELEASE} && \ - git checkout ${PG_RELEASE} && \ - ./configure --with-libxml && \ - cd contrib/xml2 && \ - make \ No newline at end of file + # Clone repository and build extension. +ARG EXTENSION_NAME +ARG PG_RELEASE +RUN git clone --depth 1 --branch "${PG_RELEASE}" https://github.com/postgres/postgres.git \ + && make -C postgres/contrib/${EXTENSION_NAME} USE_PGXS=1 diff --git a/contrib/xml2/Trunk.toml b/contrib/xml2/Trunk.toml index 8cf1b001..96a38aca 100644 --- a/contrib/xml2/Trunk.toml +++ b/contrib/xml2/Trunk.toml @@ -12,12 +12,7 @@ categories = ["data_transformations"] apt = ["libxml2", "libc6"] [build] -postgres_version = "15" +postgres_version = "17" platform = "linux/amd64" dockerfile = "Dockerfile" -install_command = """ - cd postgres/contrib/xml2 && make install - set -x - mv /usr/local/pgsql/share/extension/* /usr/share/postgresql/15/extension - mv /usr/local/pgsql/lib/* /usr/lib/postgresql/15/lib - """ \ No newline at end of file +install_command = "make -C postgres/contrib/xml2 install USE_PGXS=1"