From fca2020ddb108052b025dc75e594776bf93f7fc1 Mon Sep 17 00:00:00 2001 From: vados Date: Wed, 6 Mar 2024 15:51:04 +0900 Subject: [PATCH] chore(deps): update postgres 16 to v16.2 --- .github/workflows/build-and-test-gnu/action.yaml | 4 ++-- .github/workflows/build-rpm/action.yaml | 4 ++-- .github/workflows/container.yaml | 2 +- .github/workflows/release.yaml | 4 ++-- Justfile | 4 ++-- README.md | 16 ++++++++-------- .../docker/base-pkg-alpine3.18-amd64.Dockerfile | 2 +- .../pg_idkit-pg16.1-alpine3.18-amd64.Dockerfile | 6 +++--- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-and-test-gnu/action.yaml b/.github/workflows/build-and-test-gnu/action.yaml index 91463ab..75378d6 100644 --- a/.github/workflows/build-and-test-gnu/action.yaml +++ b/.github/workflows/build-and-test-gnu/action.yaml @@ -47,9 +47,9 @@ inputs: PGRX version (ex. 'pg15', 'pg16') pg-version: type: string - default: 16.1 + default: 16.2 decription: | - Postgres version (ex. '15.5, '16.1') + Postgres version (ex. '15.5, '16.2') outputs: {} runs: using: "composite" diff --git a/.github/workflows/build-rpm/action.yaml b/.github/workflows/build-rpm/action.yaml index 728557a..4b352a2 100644 --- a/.github/workflows/build-rpm/action.yaml +++ b/.github/workflows/build-rpm/action.yaml @@ -26,9 +26,9 @@ inputs: PGRX version (ex. 'pg15', 'pg16') pg-version: type: string - default: 16.1 + default: 16.2 decription: | - Postgres version (ex. '15.5, '16.1') + Postgres version (ex. '15.5, '16.2') user: type: string default: runner diff --git a/.github/workflows/container.yaml b/.github/workflows/container.yaml index a729f22..fdf0644 100644 --- a/.github/workflows/container.yaml +++ b/.github/workflows/container.yaml @@ -30,7 +30,7 @@ jobs: runner: ubuntu-22.04 container: arch: amd64 - pg_version: 16.1 + pg_version: 16.2 os_version: alpine3.18 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 6238180..c2cbff0 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,7 +22,7 @@ jobs: - pgrx: pg-version: pg16 pg: - version: 16.1 + version: 16.2 steps: - uses: actions/checkout@v3 @@ -47,7 +47,7 @@ jobs: - pgrx: pg-version: pg16 pg: - version: 16.1 + version: 16.2 steps: - uses: actions/checkout@v3 diff --git a/Justfile b/Justfile index 7de6ef3..9697074 100644 --- a/Justfile +++ b/Justfile @@ -26,7 +26,7 @@ cargo_features_arg := if cargo_features != "" { changelog_file_path := absolute_path(justfile_directory() / "CHANGELOG") -pkg_pg_version := env_var_or_default("PKG_PG_VERSION", "16.1") +pkg_pg_version := env_var_or_default("PKG_PG_VERSION", "16.2") pkg_pg_config_path := env_var_or_default("PKG_PG_CONFIG_PATH", "~/.pgrx/" + pkg_pg_version + "/pgrx-install/bin/pg_config") pkg_tarball_suffix := env_var_or_default("PKG_TARBALL_SUFFIX", "") @@ -138,7 +138,7 @@ pgrx-init: container_img_arch := env_var_or_default("CONTAINER_IMAGE_ARCH", "amd64") -pg_image_version := env_var_or_default("POSTGRES_IMAGE_VERSION", "16.1") +pg_image_version := env_var_or_default("POSTGRES_IMAGE_VERSION", "16.2") pg_os_image_version := env_var_or_default("POSTGRES_OS_IMAGE_VERSION", "alpine3.18") pgidkit_image_name := env_var_or_default("PGIDKIT_IMAGE_NAME", "ghcr.io/vadosware/pg_idkit") diff --git a/README.md b/README.md index 8d7840b..be26bbe 100644 --- a/README.md +++ b/README.md @@ -65,7 +65,7 @@ docker run \ -e POSTGRES_PASSWORD=replace_this \ -p 5432 \ --name pg_idkit \ - ghcr.io/vadosware/pg_idkit:0.2.2-pg16.1-alpine3.18-amd64 + ghcr.io/vadosware/pg_idkit:0.2.2-pg16.2-alpine3.18-amd64 ``` > [!WARNING] @@ -77,7 +77,7 @@ Once the postgres server is running, open another shell and connect to the docke ```console ➜ docker exec -it pg_idkit psql -U postgres -psql (16.1) +psql (16.2) Type "help" for help. postgres=# CREATE EXTENSION pg_idkit; @@ -111,7 +111,7 @@ target/release/pg_idkit-pg16 ├── home │   └── │   └── .pgrx -│   └── 16.1 +│   └── 16.2 │   └── pgrx-install │   ├── lib │   │   └── postgresql @@ -137,9 +137,9 @@ As the installation of the extension into a specific version of postgres uses yo In the example above, the [files you need for a Postgres extension][pg-ext-files] are: -- `target/release/home//.pgrx/16.1/pgrx-install/lib/postgresql/pg_idkit.so` -- `target/release/home//.pgrx/16.1/pgrx-install/share/postgresql/extension/pg_idkit--0.2.2.sql` -- `target/release/home//.pgrx/16.1/pgrx-install/share/postgresql/extension/pg_idkit.control` +- `target/release/home//.pgrx/16.2/pgrx-install/lib/postgresql/pg_idkit.so` +- `target/release/home//.pgrx/16.2/pgrx-install/share/postgresql/extension/pg_idkit--0.2.2.sql` +- `target/release/home//.pgrx/16.2/pgrx-install/share/postgresql/extension/pg_idkit.control` Install these files in the relevant folders for your Postgres installation -- note that exactly where these files should go can can differ across linux distributions and containerized environments. @@ -185,14 +185,14 @@ docker run \ -e POSTGRES_PASSWORD=replace_this \ -p 5432 \ --name pg_idkit \ - ghcr.io/vadosware/pg_idkit:0.2.2-pg16.1-alpine3.18-amd64 + ghcr.io/vadosware/pg_idkit:0.2.2-pg16.2-alpine3.18-amd64 ``` From another terminal, you can exec into the `pg_idkit` container and enable `pg_idkit`: ```console ➜ docker exec -it pg_idkit psql -U postgres -psql (16.1) +psql (16.2) Type "help" for help. postgres=# CREATE EXTENSION pg_idkit; diff --git a/infra/docker/base-pkg-alpine3.18-amd64.Dockerfile b/infra/docker/base-pkg-alpine3.18-amd64.Dockerfile index d4263b7..5848d36 100644 --- a/infra/docker/base-pkg-alpine3.18-amd64.Dockerfile +++ b/infra/docker/base-pkg-alpine3.18-amd64.Dockerfile @@ -9,7 +9,7 @@ ARG PGRX_PG_VERSION=pg16 ENV PGRX_PG_VERSION=$PGRX_PG_VERSION # Allow overriding features so that this file can be used to build -# different crate features. By default since this is a 16.1 base package +# different crate features. By default since this is a 16.2 base package # we expect to build with crate feature 'pg16' ARG CARGO_FEATURES=pg16 ENV CARGO_FEATURES=$CARGO_FEATURES diff --git a/infra/docker/pg_idkit-pg16.1-alpine3.18-amd64.Dockerfile b/infra/docker/pg_idkit-pg16.1-alpine3.18-amd64.Dockerfile index 65b1a94..8644e0e 100644 --- a/infra/docker/pg_idkit-pg16.1-alpine3.18-amd64.Dockerfile +++ b/infra/docker/pg_idkit-pg16.1-alpine3.18-amd64.Dockerfile @@ -10,7 +10,7 @@ ENV USER=$USER ARG PGRX_PG_VERSION=pg16 ENV PGRX_PG_VERSION=$PGRX_PG_VERSION -ARG PKG_PG_VERSION=16.1 +ARG PKG_PG_VERSION=16.2 ENV PKG_PG_VERSION=$PKG_PG_VERSION ENV PKG_TARBALL_SUFFIX="-musl" @@ -20,9 +20,9 @@ WORKDIR /pg_idkit COPY . . RUN RUSTFLAGS="-Ctarget-feature=-crt-static" just build package -FROM postgres:16.1-alpine3.18@sha256:a44705e05d7c52add276c29d355851c63b8ce7df764191095c7337848bc2d69b +FROM postgres:16.2-alpine3.18@sha256:7301126f8f27879e950feac65f148bb191007d6cd9b9a4a3a949ff85f7adca44 -# NOTE: PGRX_PG_VERSION is defined via base-pkg:pg16.1-alpine3.18-amd64 +# 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