From 0a921bb91582e782591f29989b93656481ae0794 Mon Sep 17 00:00:00 2001 From: Steven Miller Date: Sat, 2 Dec 2023 14:41:18 -0800 Subject: [PATCH 1/6] smlar (#546) --- contrib/smlar/Dockerfile | 32 ++++++++++++++++++++++++++++++++ contrib/smlar/Trunk.toml | 19 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 contrib/smlar/Dockerfile create mode 100644 contrib/smlar/Trunk.toml diff --git a/contrib/smlar/Dockerfile b/contrib/smlar/Dockerfile new file mode 100644 index 00000000..14b846a9 --- /dev/null +++ b/contrib/smlar/Dockerfile @@ -0,0 +1,32 @@ +# Set PostgreSQL version +ARG PG_VERSION=15 +FROM quay.io/coredb/c-builder:pg${PG_VERSION} +USER root + +# Extension build dependencies +RUN apt-get update && apt-get install -y \ + build-essential \ + libreadline-dev \ + zlib1g-dev \ + flex bison \ + libxml2-dev \ + libxslt-dev \ + libssl-dev \ + libxml2-utils \ + xsltproc \ + ccache + +# Clone postgres repository +ARG PG_RELEASE=REL_15_3 +RUN git clone --depth 1 --branch ${PG_RELEASE} https://github.com/postgres/postgres.git +RUN cd postgres && \ + ./configure + +#Clone jdbc repository +RUN cd postgres/contrib && \ + git clone https://github.com/jirutka/smlar.git && \ + cd smlar && git checkout f2522d5f20a46a3605a761d34a3aefcdffb94e71 + +RUN cd postgres/contrib/smlar && \ + make clean && \ + make diff --git a/contrib/smlar/Trunk.toml b/contrib/smlar/Trunk.toml new file mode 100644 index 00000000..a14fac9b --- /dev/null +++ b/contrib/smlar/Trunk.toml @@ -0,0 +1,19 @@ +[extension] +name = "smlar" +version = "1.0.0" +repository = "https://github.com/jirutka/smlar/" +license = "PostgreSQL" +description = "PostgreSQL extension for an effective similarity search" +documentation = "https://github.com/jirutka/smlar/" +categories = ["search"] + +[build] +postgres_version = "15" +platform = "linux/amd64" +dockerfile = "Dockerfile" +install_command = """ + cd postgres/contrib/smlar && 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 + """ From a4ffc2412bda97a80050d28f40267c5f48e7d746 Mon Sep 17 00:00:00 2001 From: Evan H Stanton <79367212+EvanHStanton@users.noreply.github.com> Date: Tue, 5 Dec 2023 14:02:24 -0500 Subject: [PATCH 2/6] Add permuteseq (#530) Co-authored-by: Evan Stanton --- contrib/permuteseq/Dockerfile | 16 ++++++++++++++++ contrib/permuteseq/Trunk.toml | 18 ++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 contrib/permuteseq/Dockerfile create mode 100644 contrib/permuteseq/Trunk.toml diff --git a/contrib/permuteseq/Dockerfile b/contrib/permuteseq/Dockerfile new file mode 100644 index 00000000..f3775e54 --- /dev/null +++ b/contrib/permuteseq/Dockerfile @@ -0,0 +1,16 @@ +# Set PostgreSQL version +ARG PG_VERSION=15 +FROM quay.io/coredb/c-builder:pg${PG_VERSION} +USER root + +# Clone repository +RUN git clone https://github.com/dverite/permuteseq.git + +ARG RELEASE=v1.2.2 + +# Build extension +RUN cd permuteseq && \ + git fetch origin ${RELEASE} && \ + git checkout ${RELEASE} && \ + make + diff --git a/contrib/permuteseq/Trunk.toml b/contrib/permuteseq/Trunk.toml new file mode 100644 index 00000000..9ff5fd3d --- /dev/null +++ b/contrib/permuteseq/Trunk.toml @@ -0,0 +1,18 @@ +[extension] +name = "permuteseq" +version = "1.2.2" +repository = "https://github.com/dverite/permuteseq" +license = "PostgreSQL" +description = "Pseudo-randomly permute sequences with a format-preserving encryption on elements." +categories = ["analytics"] + +[build] +postgres_version = "15" +platform = "linux/amd64" +dockerfile = "Dockerfile" +install_command = """ + cd permuteseq && 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 + """ From 55ec625143f37bc8532387998d5422f28ac32cc0 Mon Sep 17 00:00:00 2001 From: Evan H Stanton <79367212+EvanHStanton@users.noreply.github.com> Date: Tue, 5 Dec 2023 14:42:39 -0500 Subject: [PATCH 3/6] Add pg_store_plans (#529) Co-authored-by: Evan Stanton --- contrib/pg_store_plans/Dockerfile | 38 +++++++++++++++++++++++++++++++ contrib/pg_store_plans/Trunk.toml | 20 ++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 contrib/pg_store_plans/Dockerfile create mode 100644 contrib/pg_store_plans/Trunk.toml diff --git a/contrib/pg_store_plans/Dockerfile b/contrib/pg_store_plans/Dockerfile new file mode 100644 index 00000000..9f092992 --- /dev/null +++ b/contrib/pg_store_plans/Dockerfile @@ -0,0 +1,38 @@ +ARG PG_VERSION=15 +FROM quay.io/coredb/c-builder:pg${PG_VERSION} +USER root + +# Extension build dependencies +RUN apt-get update && apt-get install -y \ + build-essential \ + libreadline-dev \ + zlib1g-dev \ + flex bison \ + libxml2-dev \ + libxslt-dev \ + libssl-dev \ + libxml2-utils \ + xsltproc \ + ccache + +# Clone repository +RUN git clone https://github.com/postgres/postgres.git + +# Use argument to specify PostgreSQL release +ARG PG_RELEASE=REL_15_3 + +# Configure and build PostgreSQL +RUN cd postgres && \ + git fetch origin ${PG_RELEASE} && \ + git checkout ${PG_RELEASE} && \ + ./configure && \ + cd contrib && \ + git clone https://github.com/ossc-db/pg_store_plans.git + +ARG RELEASE=1.7 + +# Build extension +RUN cd postgres/contrib/pg_store_plans && \ + git fetch origin ${RELEASE} && \ + git checkout ${RELEASE} && \ + make diff --git a/contrib/pg_store_plans/Trunk.toml b/contrib/pg_store_plans/Trunk.toml new file mode 100644 index 00000000..2b7a8426 --- /dev/null +++ b/contrib/pg_store_plans/Trunk.toml @@ -0,0 +1,20 @@ +[extension] +name = "pg_store_plans" +version = "1.7.0" +repository = "https://github.com/ossc-db/pg_store_plans" +license = "Copyright" +description = "Track plan statistics of all SQL statements executed." +documentation = "https://ossc-db.github.io/pg_store_plans/" +categories = ["metrics"] +preload_libraries = ["pg_store_plans"] + +[build] +postgres_version = "15" +platform = "linux/amd64" +dockerfile = "Dockerfile" +install_command = """ + cd postgres/contrib/pg_store_plans && 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 + """ From 9eaa819340d80f32e830bbb346b2dd8e844afbf2 Mon Sep 17 00:00:00 2001 From: Adam Hendel Date: Wed, 6 Dec 2023 09:25:57 -0600 Subject: [PATCH 4/6] s3_fdw for wrappers (#548) --- contrib/wrappers/Dockerfile | 7 ++++--- contrib/wrappers/Trunk.toml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/contrib/wrappers/Dockerfile b/contrib/wrappers/Dockerfile index aa44aba4..b42c063b 100644 --- a/contrib/wrappers/Dockerfile +++ b/contrib/wrappers/Dockerfile @@ -1,5 +1,5 @@ ARG PG_VERSION=15 -FROM quay.io/coredb/pgrx-builder:pg${PG_VERSION}-pgrx0.9.7 +FROM quay.io/coredb/pgrx-builder:pg${PG_VERSION}-pgrx0.11.0 USER root # quay.io/coredb/pgrx-builder:pg15-pgrx0.9.7 # Extension build dependencies @@ -25,6 +25,7 @@ RUN apt-get update && apt-get install -y \ # Install Rust RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y +RUN cargo install cargo-pgrx --version 0.11.0 --locked # Set default Rust version RUN /root/.cargo/bin/rustup default stable @@ -32,7 +33,7 @@ RUN /root/.cargo/bin/rustup default stable # Clone repository RUN git clone https://github.com/supabase/wrappers.git -ARG RELEASE=v0.1.15 +ARG RELEASE=v0.2.0 # Build the extension RUN cd wrappers/wrappers && \ @@ -40,4 +41,4 @@ RUN cd wrappers/wrappers && \ git fetch origin ${RELEASE} && \ git checkout ${RELEASE} && \ cargo pgrx init --pg15 /usr/bin/pg_config && \ - cargo pgrx package + cargo pgrx package -F all_fdws diff --git a/contrib/wrappers/Trunk.toml b/contrib/wrappers/Trunk.toml index 8dc16d44..cbb13a89 100644 --- a/contrib/wrappers/Trunk.toml +++ b/contrib/wrappers/Trunk.toml @@ -1,6 +1,6 @@ [extension] name = "wrappers" -version = "0.1.15" +version = "0.2.0" repository = "https://github.com/supabase/wrappers" license = "Apache-2.0" description = "Postgres Foreign Data Wrapper development framework in Rust." From 8bcaba637bf790871120c866588fcc4b24030e6e Mon Sep 17 00:00:00 2001 From: Evan H Stanton <79367212+EvanHStanton@users.noreply.github.com> Date: Thu, 7 Dec 2023 10:08:36 -0500 Subject: [PATCH 5/6] Add Age (#526) Co-authored-by: Evan Stanton --- contrib/age/Dockerfile | 41 +++++++++++++++++++++++++++++++++++++++++ contrib/age/Trunk.toml | 20 ++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 contrib/age/Dockerfile create mode 100644 contrib/age/Trunk.toml diff --git a/contrib/age/Dockerfile b/contrib/age/Dockerfile new file mode 100644 index 00000000..064dd44e --- /dev/null +++ b/contrib/age/Dockerfile @@ -0,0 +1,41 @@ +# Set the PostgreSQL version +ARG PG_VERSION=15 +FROM quay.io/coredb/c-builder:pg${PG_VERSION} +USER root + +# Extension build dependencies +RUN apt-get update && apt-get install -y \ + build-essential \ + libreadline-dev \ + zlib1g-dev \ + flex \ + bison \ + libxml2-dev \ + libxslt-dev \ + libssl-dev \ + libxml2-utils \ + xsltproc \ + ccache \ + python3 \ + python3-dev \ + python3-setuptools \ + python3-pip && \ + apt-get clean && rm -rf /var/lib/apt/lists/* + +# Clone repository +RUN git clone https://github.com/postgres/postgres.git + +# Use argument to specify PostgreSQL release +ARG PG_RELEASE=REL_15_3 + +# Configure and build PostgreSQL +RUN cd postgres && \ + git fetch origin ${PG_RELEASE} && \ + git checkout ${PG_RELEASE} && \ + ./configure && \ + cd contrib && \ + git clone https://github.com/apache/age.git + +RUN cd postgres/contrib/age && \ + git checkout PG15/v1.4.0-rc0 && \ + make diff --git a/contrib/age/Trunk.toml b/contrib/age/Trunk.toml new file mode 100644 index 00000000..b8089e37 --- /dev/null +++ b/contrib/age/Trunk.toml @@ -0,0 +1,20 @@ +[extension] +name = "age" +version = "1.4.0" +repository = "https://github.com/apache/age" +license = "Apache-2.0" +description = "Leverage a graph database on top of the existing relational database." +homepage = "https://age.apache.org/" +documentation = "https://age.apache.org/age-manual/master/index.html" +categories = ["data_transformations"] + +[build] +postgres_version = "15" +platform = "linux/amd64" +dockerfile = "Dockerfile" +install_command = """ + cd postgres/contrib/age && 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 + """ From 17ab84d1b8fefdbc7e9b10a9cbd93efc08121746 Mon Sep 17 00:00:00 2001 From: Darren Baldwin <68653294+DarrenBaldwin07@users.noreply.github.com> Date: Thu, 7 Dec 2023 11:59:55 -0500 Subject: [PATCH 6/6] remove github token from nextjs.config.js env (#552) Co-authored-by: Darren B <68653294+Devd0@users.noreply.github.com> --- ui/next.config.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ui/next.config.js b/ui/next.config.js index 47d1b12a..86addeae 100644 --- a/ui/next.config.js +++ b/ui/next.config.js @@ -1,9 +1,12 @@ /** @type {import('next').NextConfig} */ const nextConfig = { reactStrictMode: true, - env: { - GITHUB_TOKEN: process.env.GITHUB_TOKEN, - }, -} + /* Do not use this for server-only env vars + * see: https://nextjs.org/docs/pages/api-reference/next-config-js/env + * use this approach instead: https://docs.aws.amazon.com/amplify/latest/userguide/ssr-environment-variables.html + * also see: https://nextjs.org/docs/pages/building-your-application/configuring/environment-variables + */ + env: {}, +}; -module.exports = nextConfig +module.exports = nextConfig;