Skip to content

Commit

Permalink
Merge branch 'main' into pg16
Browse files Browse the repository at this point in the history
  • Loading branch information
sjmiller609 authored Dec 7, 2023
2 parents fbcf374 + 17ab84d commit 152182a
Show file tree
Hide file tree
Showing 11 changed files with 217 additions and 9 deletions.
41 changes: 41 additions & 0 deletions contrib/age/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
20 changes: 20 additions & 0 deletions contrib/age/Trunk.toml
Original file line number Diff line number Diff line change
@@ -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
"""
16 changes: 16 additions & 0 deletions contrib/permuteseq/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

18 changes: 18 additions & 0 deletions contrib/permuteseq/Trunk.toml
Original file line number Diff line number Diff line change
@@ -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
"""
38 changes: 38 additions & 0 deletions contrib/pg_store_plans/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
20 changes: 20 additions & 0 deletions contrib/pg_store_plans/Trunk.toml
Original file line number Diff line number Diff line change
@@ -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
"""
32 changes: 32 additions & 0 deletions contrib/smlar/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
19 changes: 19 additions & 0 deletions contrib/smlar/Trunk.toml
Original file line number Diff line number Diff line change
@@ -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
"""
7 changes: 4 additions & 3 deletions contrib/wrappers/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -25,19 +25,20 @@ 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

# 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 && \
git submodule update --init --recursive && \
git fetch origin ${RELEASE} && \
git checkout ${RELEASE} && \
cargo pgrx init --pg15 /usr/bin/pg_config && \
cargo pgrx package
cargo pgrx package -F all_fdws
2 changes: 1 addition & 1 deletion contrib/wrappers/Trunk.toml
Original file line number Diff line number Diff line change
@@ -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."
Expand Down
13 changes: 8 additions & 5 deletions ui/next.config.js
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 152182a

Please sign in to comment.