Merge branch '10-add-pgbackrest-binary-to-the-extended-postgres-image' into 'master'

Resolve "Add pgbackrest binary to the extended postgres image"

Closes #10

See merge request postgres-ai/custom-images!37

Author: agneum

README.md

@@ -121,6 +121,7 @@ The PostgreSQL 14 image is now missing the following extensions (they will be ad
 
 ### PostgreSQL Tools:
 - [WAL-G](https://github.com/wal-g/wal-g)
+- [pgBackRest](https://github.com/pgbackrest/pgbackrest)
 
 ## Sync Instance images
 

extended-postgres/Dockerfile

@@ -9,6 +9,9 @@ ENV PG_SERVER_VERSION=${PG_SERVER_VERSION:-14}
 ARG WALG_VERSION
 ENV WALG_VERSION=${WALG_VERSION:-0.2.19}
 
+ARG PGBR_VERSION
+ENV PGBR_VERSION=${PGBR_VERSION:-2.37}
+
 RUN apt-get clean && rm -rf /var/lib/apt/lists/partial \
     && apt-get update -o Acquire::CompressionTypes::Order::=gz \
     && apt-get install --no-install-recommends -y wget make gcc unzip sudo git \
@@ -109,6 +112,9 @@ RUN apt-get clean && rm -rf /var/lib/apt/lists/partial \
  # WAL-G
    && wget --quiet -O /tmp/wal-g.linux-amd64.tar.gz "https://github.com/wal-g/wal-g/releases/download/v${WALG_VERSION}/wal-g.linux-amd64.tar.gz" \
    && tar -zxvf /tmp/wal-g.linux-amd64.tar.gz && mv wal-g /usr/local/bin/ \
+ # pgBackRest
+   && apt-get install --no-install-recommends -y pgbackrest=${PGBR_VERSION}* zstd openssh-client \
+   && mkdir -p -m 700 /var/lib/postgresql/.ssh  && chown postgres:postgres /var/lib/postgresql/.ssh \
    # remove all auxilary packages to reduce final image size
    && cd / && rm -rf /tmp/* && apt-get purge -y --auto-remove gcc \
       make wget unzip curl libc6-dev apt-transport-https git \

extended-postgres/build-images-ci.yml

@@ -31,7 +31,7 @@ stages:
     REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
     REGISTRY: "${CI_REGISTRY}"
     DOCKER_FILE: "extended-postgres/Dockerfile"
-    DOCKER_NAME: "registry.gitlab.com/postgres-ai/custom-images/extended-postgres"
+    DOCKER_NAME: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/extended-postgres"
 
 .only_var_template: &only_tag_release
   only:

migration-tools/build-images-migration-tools.yml

@@ -29,7 +29,7 @@ stages:
     REGISTRY_USER: "${CI_REGISTRY_USER}"
     REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
     REGISTRY: "${CI_REGISTRY}"
-    DOCKER_NAME: "registry.gitlab.com/postgres-ai/custom-images/migration-tools"
+    DOCKER_NAME: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/migration-tools"
 
 .only_var_template: &only_tag_release
   only: