From bd2213f395d53bfd72dd229ab1e4a531d9cd7528 Mon Sep 17 00:00:00 2001 From: woblerr Date: Sun, 3 Nov 2024 00:57:24 +0300 Subject: [PATCH 1/2] Add pgBackRest v2.54.0. Delete info about pgBackRest v2.51. --- Makefile | 4 ++-- README.md | 32 ++++++++++++++++---------------- e2e_tests/.env | 2 +- e2e_tests/conf/pg/Dockerfile | 2 +- e2e_tests/conf/sftp/Dockerfile | 2 +- 5 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 47c0652..deddbc5 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -BACKREST_VERSIONS = 2.51 2.52 2.52.1 2.53 2.53.1 -TAG?=2.53.1 +BACKREST_VERSIONS = 2.52 2.52.1 2.53 2.53.1 2.54.0 +TAG?=2.54.0 TAG_MESON_BUILD=2.51 BACKREST_DOWNLOAD_URL = https://github.com/pgbackrest/pgbackrest/archive/release BACKREST_GPDB_VERSIONS = 2.47_arenadata4 2.50_arenadata4 2.52_arenadata4 diff --git a/README.md b/README.md index e98ed3d..061e829 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,9 @@ The repository contains information for the last 5 releases of pgBackRest. If ne Supported pgBackRest version tags: -* `2.53.1`, `latest` +* `2.54.0`, `latest` +* `2.54.0-alpine` +* `2.53.1` * `2.53.1-alpine` * `2.53` * `2.53-alpine` @@ -16,8 +18,6 @@ Supported pgBackRest version tags: * `2.52.1-alpine` * `2.52` * `2.52-alpine` -* `2.51` -* `2.51-alpine` The repository also contains information for releases of pgBackRest fork with Greenplum support (see [pgbackrest/pull/1833](https://github.com/pgbackrest/pgbackrest/pull/1833)). Details - [build with Greenplum support](#build-with-greenplum-support). @@ -83,10 +83,10 @@ docker run --rm pgbackrest:51 pgbackrest help ### Injecting inside ```bash -docker run --rm -it pgbackrest:2.53.1 bash +docker run --rm -it pgbackrest:2.54.0 bash pgbackrest@cac1f58b56f2:/$ pgbackrest version -pgBackRest 2.53.1 +pgBackRest 2.54.0 ``` ### Example for Dedicated Repository Host @@ -102,7 +102,7 @@ docker run --rm \ -v ~/.ssh/id_rsa:/home/pgbackrest/.ssh/id_rsa \ -v /etc/pgbackrest:/etc/pgbackrest \ -v /var/lib/pgbackrest:/var/lib/pgbackrest \ - pgbackrest:2.53.1 \ + pgbackrest:2.54.0 \ pgbackrest backup --stanza demo --type full --log-level-console info ``` @@ -129,7 +129,7 @@ docker run --rm \ -v /etc/pgbackrest:/etc/pgbackrest \ -v /var/lib/pgbackrest:/var/lib/pgbackrest \ -v /tmp/pgbackrest:/tmp/pgbackrest \ - pgbackrest:2.53.1 \ + pgbackrest:2.54.0 \ pgbackrest backup --stanza demo --type full --log-level-console info ``` @@ -165,7 +165,7 @@ docker run -d \ -v /var/lib/pgbackrest:/var/lib/pgbackrest \ -p 8432:8432 \ --name backrest_server \ - pgbackrest:2.53.1 + pgbackrest:2.54.0 ``` ##### Run container with TLS server in background for pgBackRest execution over TLS @@ -177,7 +177,7 @@ docker run --rm \ -e BACKREST_HOST_TYPE=tls \ -v /etc/pgbackrest:/etc/pgbackrest \ -v /var/lib/pgbackrest:/var/lib/pgbackrest \ - pgbackrest:2.53.1 \ + pgbackrest:2.54.0 \ pgbackrest backup --stanza demo --type full --log-level-console info ``` @@ -196,7 +196,7 @@ docker run --rm \ -v /var/lib/postgresql/12/main:/var/lib/postgresql/12/main \ -v /var/lib/pgbackrest:/var/lib/pgbackrest \ -v /var/run/postgresql/.s.PGSQL.5432:/var/run/postgresql/.s.PGSQL.5432 \ - pgbackrest:2.53.1 \ + pgbackrest:2.54.0 \ pgbackrest backup --stanza demo --type full --log-level-console info ``` @@ -216,7 +216,7 @@ docker run -d \ -v /var/lib/pgbackrest:/var/lib/pgbackrest \ -p 8432:8432 \ --name backrest_server \ - pgbackrest:2.53.1 + pgbackrest:2.54.0 ``` Performing a backup: @@ -229,28 +229,28 @@ docker run --rm \ -v /etc/pgbackrest/pgbackrest.conf:/etc/pgbackrest/pgbackrest.conf \ -v /etc/pgbackrest/cert:/etc/pgbackrest/cert \ -v /var/lib/pgbackrest:/var/lib/pgbackrest \ - pgbackrest:2.53.1 \ + pgbackrest:2.54.0 \ pgbackrest backup --stanza demo --type full --log-level-console info ``` ## Build ```bash -make build_version TAG=2.53.1 +make build_version TAG=2.54.0 ``` ```bash -make build_version_alpine TAG=2.53.1 +make build_version_alpine TAG=2.54.0 ``` or ```bash -docker build -f Dockerfile --build-arg BACKREST_VERSION=2.53.1 --build-arg BACKREST_COMPLETION_VERSION=v0.9 -t pgbackrest:2.53.1 . +docker build -f Dockerfile --build-arg BACKREST_VERSION=2.54.0 --build-arg BACKREST_COMPLETION_VERSION=v0.9 -t pgbackrest:2.54.0 . ``` ```bash -docker build -f Dockerfile.alpine --build-arg BACKREST_VERSION=2.53.1 --build-arg BACKREST_COMPLETION_VERSION=v0.9 -t pgbackrest:2.53.1-alpine . +docker build -f Dockerfile.alpine --build-arg BACKREST_VERSION=2.54.0 --build-arg BACKREST_COMPLETION_VERSION=v0.9 -t pgbackrest:2.54.0-alpine . ``` ### Build pgBackRest < `v2.51` diff --git a/e2e_tests/.env b/e2e_tests/.env index 0c18ba9..e93b128 100644 --- a/e2e_tests/.env +++ b/e2e_tests/.env @@ -1,4 +1,4 @@ -TAG=2.53.1 +TAG=2.54.0 PG_VERSION=16 IMAGE_TAG_MINIO=RELEASE.2023-09-07T02-05-02Z IMAGE_TAG_MINIO_MC=RELEASE.2023-09-07T22-48-55Z diff --git a/e2e_tests/conf/pg/Dockerfile b/e2e_tests/conf/pg/Dockerfile index 651a453..c437adc 100644 --- a/e2e_tests/conf/pg/Dockerfile +++ b/e2e_tests/conf/pg/Dockerfile @@ -1,4 +1,4 @@ -ARG BACKREST_VERSION="2.53.1" +ARG BACKREST_VERSION="2.54.0" ARG CONTAINER_TYPE="ssh" ARG PG_VERSION="16" diff --git a/e2e_tests/conf/sftp/Dockerfile b/e2e_tests/conf/sftp/Dockerfile index 9da0766..01167bd 100644 --- a/e2e_tests/conf/sftp/Dockerfile +++ b/e2e_tests/conf/sftp/Dockerfile @@ -1,4 +1,4 @@ -ARG BACKREST_VERSION="2.53.1" +ARG BACKREST_VERSION="2.54.0" FROM pgbackrest:${BACKREST_VERSION} ARG CONTAINER_TYPE="rsa" From 32db7aac4266dd777a5139499a87921324e3e139 Mon Sep 17 00:00:00 2001 From: woblerr Date: Sun, 3 Nov 2024 01:25:36 +0300 Subject: [PATCH 2/2] Bump pgBackRest v2.52 with Greenplum support to v6. Add missing changes to CI file. --- .github/workflows/build.yml | 6 +++--- Makefile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f1c1f2f..9d23e26 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,9 +11,9 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - pgbackrest_version: ["2.51", "2.52", "2.52.1", "2.53", "2.53.1"] + pgbackrest_version: ["2.52", "2.52.1", "2.53", "2.53.1", "2.54.0"] env: - latest_version: "2.53.1" + latest_version: "2.54.0" download_url: "https://github.com/pgbackrest/pgbackrest/archive/release" steps: - uses: actions/checkout@v2 @@ -151,7 +151,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - pgbackrest_version: ["2.47_arenadata4", "2.50_arenadata4", "2.52_arenadata4"] + pgbackrest_version: ["2.47_arenadata4", "2.50_arenadata4", "2.52_arenadata6"] env: download_url: "https://github.com/arenadata/pgbackrest/archive" steps: diff --git a/Makefile b/Makefile index deddbc5..d6b60bd 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ BACKREST_VERSIONS = 2.52 2.52.1 2.53 2.53.1 2.54.0 TAG?=2.54.0 TAG_MESON_BUILD=2.51 BACKREST_DOWNLOAD_URL = https://github.com/pgbackrest/pgbackrest/archive/release -BACKREST_GPDB_VERSIONS = 2.47_arenadata4 2.50_arenadata4 2.52_arenadata4 -TAG_GPDB?=2.52_arenadata4 +BACKREST_GPDB_VERSIONS = 2.47_arenadata4 2.50_arenadata4 2.52_arenadata6 +TAG_GPDB?=2.52_arenadata6 BACKREST_GPDB_DOWNLOAD_URL = https://github.com/arenadata/pgbackrest/archive BACKREST_COMP_VERSION?=v0.9 UID := $(shell id -u)