Update remaining pl extensions

Refactor the build scripting for and upgrade the versions of: * pguri * pgvector * plcoffee * plpgsql_check 2.7.12 * plprofiler 4.2.5 * plproxy 2.11.0 * plr 8.4.7
tembo-io · Dec 19, 2024 · fedfd1e · fedfd1e
1 parent a125182
commit fedfd1e
Show file tree

Hide file tree

Showing 14 changed files with 67 additions and 145 deletions.
diff --git a/contrib/pguri/Dockerfile b/contrib/pguri/Dockerfile
@@ -1,20 +1,14 @@
 # Set PostgreSQL version
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
-USER root
 
 # Extension build dependencies
-RUN apt-get update && apt-get install -y \
-    liburiparser-dev
-
-# Clone repository
-RUN git clone https://github.com/petere/pguri.git
+USER root
+RUN apt-get update && apt-get install -y liburiparser-dev
 
-# Set project version
+# Clone and build the extension.
+ARG EXTENSION_NAME
+# ARG EXTENSION_VERSION
 ARG RELEASE=1.20151224
-
-# Build extension
-RUN cd pguri && \
-    git fetch origin ${RELEASE} && \
-    git checkout ${RELEASE} && \
-    make
+RUN git clone --depth 1 --branch "${RELEASE}" https://github.com/petere/${EXTENSION_NAME}.git \
+    && make -C ${EXTENSION_NAME}
diff --git a/contrib/pguri/Trunk.toml b/contrib/pguri/Trunk.toml
@@ -11,12 +11,7 @@ categories = ["data_transformations"]
 apt = ["liburiparser1", "libc6"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd pguri && 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 pguri install"
diff --git a/contrib/pgvector/Dockerfile b/contrib/pgvector/Dockerfile
@@ -1,14 +1,8 @@
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
-USER root
 
-# Clone repository
-RUN git clone https://github.com/pgvector/pgvector.git
-
-ARG EXTENSION_VERSION=v0.8.0
-
-# Build extension
-RUN cd pgvector && \
-	git fetch origin v${EXTENSION_VERSION} && \
-	git checkout v${EXTENSION_VERSION} && \
-	make
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "v${EXTENSION_VERSION}" https://github.com/${EXTENSION_NAME}/${EXTENSION_NAME}.git \
+    && make -C ${EXTENSION_NAME}
diff --git a/contrib/pgvector/Trunk.toml b/contrib/pgvector/Trunk.toml
@@ -15,9 +15,4 @@ apt = ["libc6"]
 postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd pgvector && 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 pgvector install"
diff --git a/contrib/plcoffee/Dockerfile b/contrib/plcoffee/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 \
@@ -20,12 +20,8 @@ RUN apt-get update && apt-get install -y \
 	python3 \
    	pkg-config
 
-# Clone repository
-RUN git clone https://github.com/plv8/plv8.git
-
-ARG RELEASE=v3.1.10
-
-RUN cd plv8 && \
-	git fetch origin ${RELEASE} && \
-	git checkout ${RELEASE} && \
-	make
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "v${EXTENSION_VERSION}" https://github.com/plv8/plv8.git \
+    && make -C plv8
diff --git a/contrib/plcoffee/Trunk.toml b/contrib/plcoffee/Trunk.toml
@@ -11,12 +11,7 @@ categories = ["procedural_languages"]
 apt = ["libstdc++6", "libgcc-s1", "libc6"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd plv8 && make install
-    find /usr/share/postgresql/15/extension -type f -iname '*plv8*' -exec rm {} +
-    find /usr/share/postgresql/15/extension -type f -iname '*plls*' -exec rm {} +
-    find /usr/lib/postgresql/15/lib -type f -iname '*live*' -exec rm {} +
-"""
+install_command = "cd plv8 && make install"
diff --git a/contrib/plpgsql_check/Dockerfile b/contrib/plpgsql_check/Dockerfile
@@ -1,15 +1,10 @@
 # Set PostgreSQL version
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
 
-# Clone repository
-RUN git clone https://github.com/okbob/plpgsql_check.git
 
-# Set project version
-ARG RELEASE=v2.3.4
-
-# Build extension
-RUN cd plpgsql_check && \
-    git fetch origin ${RELEASE} && \
-    git checkout ${RELEASE} && \
-    make
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "v${EXTENSION_VERSION}" https://github.com/okbob/${EXTENSION_NAME}.git \
+    && make -C ${EXTENSION_NAME}
diff --git a/contrib/plpgsql_check/Trunk.toml b/contrib/plpgsql_check/Trunk.toml
@@ -1,6 +1,6 @@
 [extension]
 name = "plpgsql_check"
-version = "2.3.0"
+version = "2.7.12"
 repository = "https://github.com/okbob/plpgsql_check"
 license = "Copyright"
 description = "Linter tool for the PostgreSQL language plpgsql."
@@ -11,12 +11,7 @@ categories = ["debugging"]
 apt = ["libc6"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd plpgsql_check && 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 plpgsql_check install"
diff --git a/contrib/plprofiler/Dockerfile b/contrib/plprofiler/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,17 +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
-
-# Build extension
-RUN cd postgres && \
-	git fetch origin ${PG_RELEASE} && \
-	git checkout ${PG_RELEASE} && \
-	./configure && \
-	cd contrib && \
-	git clone https://github.com/bigsql/plprofiler.git && \
-	cd plprofiler && \
-	make USE_PGXS=1
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "REL$(perl -E 'print shift =~ s/\./_/gr' "${EXTENSION_VERSION}")" https://github.com/bigsql/${EXTENSION_NAME}.git \
+    && make -C ${EXTENSION_NAME} USE_PGXS=1
diff --git a/contrib/plprofiler/Trunk.toml b/contrib/plprofiler/Trunk.toml
@@ -1,6 +1,6 @@
 [extension]
 name = "plprofiler"
-version = "4.2.0"
+version = "4.2.5"
 repository = "https://github.com/bigsql/plprofiler"
 license = "Copyright"
 description = "The plprofiler is an extension for the PostgreSQL database system to create performance profiles of PL/pgSQL functions and stored procedures."
@@ -11,12 +11,7 @@ categories = ["metrics"]
 apt = ["libc6"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd postgres/contrib/plprofiler && make USE_PGXS=1 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 plprofiler USE_PGXS=1 install"
diff --git a/contrib/plproxy/Dockerfile b/contrib/plproxy/Dockerfile
@@ -1,20 +1,13 @@
 # Set PostgreSQL version
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
-USER root
 
 # Extension build dependencies
-RUN apt-get update && apt-get install -y \
-    bison
-
-# Clone repository
-RUN git clone https://github.com/plproxy/plproxy.git
-
-# Set project version
-ARG RELEASE=v2.10.0
+USER root
+RUN apt-get update && apt-get install -y bison
 
-# Build extension
-RUN cd plproxy && \
-    git fetch origin ${RELEASE} && \
-    git checkout ${RELEASE} && \
-    make
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "v${EXTENSION_VERSION}" https://github.com/${EXTENSION_NAME}/${EXTENSION_NAME}.git \
+    && make -C ${EXTENSION_NAME}
diff --git a/contrib/plproxy/Trunk.toml b/contrib/plproxy/Trunk.toml
@@ -1,6 +1,6 @@
 [extension]
 name = "plproxy"
-version = "2.10.0"
+version = "2.11.0"
 repository = "https://github.com/plproxy/plproxy"
 license = "Copyright"
 description = "PL/Proxy development."
@@ -12,12 +12,7 @@ categories = ["procedural_languages"]
 apt = ["libpq5", "libc6"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd plproxy && 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 plproxy install"
diff --git a/contrib/plr/Dockerfile b/contrib/plr/Dockerfile
@@ -1,20 +1,14 @@
 # Set PostgreSQL version
-ARG PG_VERSION=15
+ARG PG_VERSION
 FROM quay.io/coredb/c-builder:pg${PG_VERSION}
-USER root
 
 # Extension build dependencies
-RUN apt-get update && apt-get install -y \
-    r-base-dev
-
-# Clone repository
-RUN git clone https://github.com/postgres-plr/plr.git
+USER root
+RUN apt-get update && apt-get install -y r-base-dev
 
-# Set project version
-ARG RELEASE=REL8_4_5
 
-# Build extension
-RUN cd plr && \
-    git fetch origin ${RELEASE} && \
-    git checkout ${RELEASE} && \
-    make USE_PGXS=1
+# Clone and build the extension.
+ARG EXTENSION_NAME
+ARG EXTENSION_VERSION
+RUN git clone --depth 1 --branch "REL$(perl -E 'print shift =~ s/\./_/gr' "${EXTENSION_VERSION}")" https://github.com/postgres-${EXTENSION_NAME}/${EXTENSION_NAME}.git \
+    && make -C ${EXTENSION_NAME} USE_PGXS=1
diff --git a/contrib/plr/Trunk.toml b/contrib/plr/Trunk.toml
@@ -1,6 +1,6 @@
 [extension]
 name = "plr"
-version = "8.4.5"
+version = "8.4.7"
 repository = "https://github.com/postgres-plr/plr"
 license = "GPL-2.0"
 description = "R Procedural Language for PostgreSQL"
@@ -11,12 +11,7 @@ categories = ["procedural_languages"]
 apt = ["libc6", "r-base-core"]
 
 [build]
-postgres_version = "15"
+postgres_version = "17"
 platform = "linux/amd64"
 dockerfile = "Dockerfile"
-install_command = """
-    cd plr && make USE_PGXS=1 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 plr USE_PGXS=1 install"