-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: GitHub <[email protected]>
- Loading branch information
Showing
13 changed files
with
135 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
[package] | ||
name = "pg_idkit" | ||
version = "0.2.2" | ||
version = "0.2.3" | ||
edition = "2021" | ||
authors = ["Victor Adossi <[email protected]>"] | ||
license = "MIT" | ||
|
@@ -65,7 +65,7 @@ assets = [] | |
[package.metadata.generate-rpm.variants.pg11] | ||
assets = [ | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/lib/postgresql/pg_idkit.so", dest = "/usr/lib64/pgsql/pg_idkit.so", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit--0.2.2.sql", dest = "/usr/share/pgsql/extension/pg_idkit--0.2.2.sql", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit--0.2.3.sql", dest = "/usr/share/pgsql/extension/pg_idkit--0.2.3.sql", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit.control", dest = "/usr/share/pgsql/extension/pg_idkit.control", mode = "755" }, | ||
] | ||
requires = { postgresql-server = "> 11", glibc = "*" } | ||
|
@@ -74,7 +74,7 @@ release = "pg11" | |
[package.metadata.generate-rpm.variants.pg12] | ||
assets = [ | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/lib/postgresql/pg_idkit.so", dest = "/usr/lib64/pgsql/pg_idkit.so", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit--0.2.2.sql", dest = "/usr/share/pgsql/extension/pg_idkit--0.2.2.sql", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit--0.2.3.sql", dest = "/usr/share/pgsql/extension/pg_idkit--0.2.3.sql", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit.control", dest = "/usr/share/pgsql/extension/pg_idkit.control", mode = "755" }, | ||
] | ||
requires = { postgresql-server = "> 12", glibc = "*" } | ||
|
@@ -83,7 +83,7 @@ release = "pg12" | |
[package.metadata.generate-rpm.variants.pg13] | ||
assets = [ | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/lib/postgresql/pg_idkit.so", dest = "/usr/lib64/pgsql/pg_idkit.so", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit--0.2.2.sql", dest = "/usr/share/pgsql/extension/pg_idkit--0.2.2.sql", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit--0.2.3.sql", dest = "/usr/share/pgsql/extension/pg_idkit--0.2.3.sql", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit.control", dest = "/usr/share/pgsql/extension/pg_idkit.control", mode = "755" }, | ||
] | ||
requires = { postgresql-server = "> 13", glibc = "*" } | ||
|
@@ -92,7 +92,7 @@ release = "pg13" | |
[package.metadata.generate-rpm.variants.pg14] | ||
assets = [ | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/lib/postgresql/pg_idkit.so", dest = "/usr/lib64/pgsql/pg_idkit.so", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit--0.2.2.sql", dest = "/usr/share/pgsql/extension/pg_idkit--0.2.2.sql", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit--0.2.3.sql", dest = "/usr/share/pgsql/extension/pg_idkit--0.2.3.sql", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit.control", dest = "/usr/share/pgsql/extension/pg_idkit.control", mode = "755" }, | ||
] | ||
requires = { postgresql-server = "> 14", glibc = "*" } | ||
|
@@ -101,7 +101,7 @@ release = "pg14" | |
[package.metadata.generate-rpm.variants.pg15] | ||
assets = [ | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/lib/postgresql/pg_idkit.so", dest = "/usr/lib64/pgsql/pg_idkit.so", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit--0.2.2.sql", dest = "/usr/share/pgsql/extension/pg_idkit--0.2.2.sql", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit--0.2.3.sql", dest = "/usr/share/pgsql/extension/pg_idkit--0.2.3.sql", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit.control", dest = "/usr/share/pgsql/extension/pg_idkit.control", mode = "755" }, | ||
] | ||
requires = { postgresql-server = "> 15", glibc = "*" } | ||
|
@@ -110,7 +110,7 @@ release = "pg15" | |
[package.metadata.generate-rpm.variants.pg16] | ||
assets = [ | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/lib/postgresql/pg_idkit.so", dest = "/usr/lib64/pgsql/pg_idkit.so", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit--0.2.2.sql", dest = "/usr/share/pgsql/extension/pg_idkit--0.2.2.sql", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit--0.2.3.sql", dest = "/usr/share/pgsql/extension/pg_idkit--0.2.3.sql", mode = "755" }, | ||
{ source = "/tmp/pg_idkit/rpm/scratch/pgrx-install/share/postgresql/extension/pg_idkit.control", dest = "/usr/share/pgsql/extension/pg_idkit.control", mode = "755" }, | ||
] | ||
requires = { postgresql-server = "> 16", glibc = "*" } | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
# | ||
# NOTE: you must have the base packaging layer built for this image to work | ||
# you can build this from scratch with `just build-base-pkg-image` | ||
# | ||
# `cargo pgrx init` is run in the base-pkg, so it contains the versions of pg that will be used. | ||
# | ||
FROM ghcr.io/vadosware/pg_idkit/base-pkg:0.1.x-alpine3.18-amd64 AS builder | ||
|
||
ARG USER | ||
ENV USER=$USER | ||
|
||
ARG PGRX_PG_VERSION=pg15 | ||
ENV PGRX_PG_VERSION=$PGRX_PG_VERSION | ||
|
||
ARG PKG_PG_VERSION=15.6 | ||
ENV PKG_PG_VERSION=$PKG_PG_VERSION | ||
|
||
ENV PKG_TARBALL_SUFFIX="-musl" | ||
|
||
# Re-run the build with the latest code | ||
WORKDIR /pg_idkit | ||
COPY . . | ||
RUN RUSTFLAGS="-Ctarget-feature=-crt-static" just build package | ||
|
||
FROM postgres:15.6-alpine3.18@sha256:cee29a99808ad95f0e23685b84e641c4a0ab40278b09ee0c98883e24c4c89459 | ||
|
||
# NOTE: PGRX_PG_VERSION is defined via base-pkg:pg15.6-alpine3.18-amd64 | ||
ARG PGRX_PG_VERSION=pg15 | ||
ARG PGIDKIT_VERSION | ||
ARG PGIDKIT_REVISION | ||
|
||
# Install packaged pg_idkit for system postgres | ||
COPY --from=builder /pg_idkit/pg_idkit-*-musl.tar.gz /tmp | ||
RUN tar -C /usr/local --strip-components=1 -xvf /tmp/pg_idkit-*-musl.tar.gz | ||
|
||
LABEL org.opencontainers.image.authors="Victor Adossi <[email protected]>" | ||
LABEL org.opencontainers.image.description="A distribution of the base postgres image, with pg_idkit pre-installed." | ||
LABEL org.opencontainers.image.documentation="https://github.com/VADOSWARE/pg_idkit#readme" | ||
LABEL org.opencontainers.image.licenses="Apache-2.0" | ||
LABEL org.opencontainers.image.revision=$PGIDKIT_REVISION | ||
LABEL org.opencontainers.image.source="https://github.com/VADOSWARE/pg_idkit" | ||
LABEL org.opencontainers.image.title="Postgres + pg_idkit" | ||
LABEL org.opencontainers.image.url="https://github.com/VADOSWARE/pg_idkit" | ||
LABEL org.opencontainers.image.vendor="VADOSWARE" | ||
LABEL org.opencontainers.image.version=v${PGIDKIT_VERSION} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
# | ||
# NOTE: you must have the base packaging layer built for this image to work | ||
# you can build this from scratch with `just build-base-pkg-image` | ||
# | ||
FROM ghcr.io/vadosware/pg_idkit/base-pkg:0.1.x-alpine3.18-amd64 AS builder | ||
|
||
ARG USER | ||
ENV USER=$USER | ||
|
||
ARG PGRX_PG_VERSION=pg16 | ||
ENV PGRX_PG_VERSION=$PGRX_PG_VERSION | ||
|
||
ARG PKG_PG_VERSION=16.2 | ||
ENV PKG_PG_VERSION=$PKG_PG_VERSION | ||
|
||
ENV PKG_TARBALL_SUFFIX="-musl" | ||
|
||
# Re-run the build with the latest code | ||
WORKDIR /pg_idkit | ||
COPY . . | ||
RUN RUSTFLAGS="-Ctarget-feature=-crt-static" just build package | ||
|
||
FROM postgres:16.2-alpine3.18@sha256:7301126f8f27879e950feac65f148bb191007d6cd9b9a4a3a949ff85f7adca44 | ||
|
||
# NOTE: PGRX_PG_VERSION is defined via base-pkg:pg16.2-alpine3.18-amd64 | ||
ARG PGRX_PG_VERSION=pg16 | ||
ENV PGRX_PG_VERSION=$PGRX_PG_VERSION | ||
|
||
# Install packaged pg_idkit for system postgres | ||
COPY --from=builder /pg_idkit/pg_idkit-*-musl.tar.gz /tmp | ||
RUN tar -C /usr/local --strip-components=1 -xvf /tmp/pg_idkit-*-musl.tar.gz | ||
|
||
ARG PGIDKIT_VERSION | ||
ARG PGIDKIT_REVISION | ||
|
||
LABEL org.opencontainers.image.authors="Victor Adossi <[email protected]>" | ||
LABEL org.opencontainers.image.description="A distribution of the base postgres image, with pg_idkit pre-installed." | ||
LABEL org.opencontainers.image.documentation="https://github.com/VADOSWARE/pg_idkit#readme" | ||
LABEL org.opencontainers.image.licenses="Apache-2.0" | ||
LABEL org.opencontainers.image.revision=${PGIDKIT_REVISION} | ||
LABEL org.opencontainers.image.source="https://github.com/VADOSWARE/pg_idkit" | ||
LABEL org.opencontainers.image.title="Postgres + pg_idkit" | ||
LABEL org.opencontainers.image.url="https://github.com/VADOSWARE/pg_idkit" | ||
LABEL org.opencontainers.image.vendor="VADOSWARE" | ||
LABEL org.opencontainers.image.version=v${PGIDKIT_VERSION} |