Skip to content

Commit 89ba910

Browse files
Nikolay Devxxagneum
authored andcommitted
Resolve "Add pgbackrest binary to the extended postgres image"
1 parent 81c7b80 commit 89ba910

File tree

4 files changed

+9
-2
lines changed

4 files changed

+9
-2
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ The PostgreSQL 14 image is now missing the following extensions (they will be ad
121121

122122
### PostgreSQL Tools:
123123
- [WAL-G](https://github.com/wal-g/wal-g)
124+
- [pgBackRest](https://github.com/pgbackrest/pgbackrest)
124125

125126
## Sync Instance images
126127

extended-postgres/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ ENV PG_SERVER_VERSION=${PG_SERVER_VERSION:-14}
99
ARG WALG_VERSION
1010
ENV WALG_VERSION=${WALG_VERSION:-0.2.19}
1111

12+
ARG PGBR_VERSION
13+
ENV PGBR_VERSION=${PGBR_VERSION:-2.37}
14+
1215
RUN apt-get clean && rm -rf /var/lib/apt/lists/partial \
1316
&& apt-get update -o Acquire::CompressionTypes::Order::=gz \
1417
&& 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 \
109112
# WAL-G
110113
&& 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" \
111114
&& tar -zxvf /tmp/wal-g.linux-amd64.tar.gz && mv wal-g /usr/local/bin/ \
115+
# pgBackRest
116+
&& apt-get install --no-install-recommends -y pgbackrest=${PGBR_VERSION}* zstd openssh-client \
117+
&& mkdir -p -m 700 /var/lib/postgresql/.ssh && chown postgres:postgres /var/lib/postgresql/.ssh \
112118
# remove all auxilary packages to reduce final image size
113119
&& cd / && rm -rf /tmp/* && apt-get purge -y --auto-remove gcc \
114120
make wget unzip curl libc6-dev apt-transport-https git \

extended-postgres/build-images-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ stages:
3131
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
3232
REGISTRY: "${CI_REGISTRY}"
3333
DOCKER_FILE: "extended-postgres/Dockerfile"
34-
DOCKER_NAME: "registry.gitlab.com/postgres-ai/custom-images/extended-postgres"
34+
DOCKER_NAME: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/extended-postgres"
3535

3636
.only_var_template: &only_tag_release
3737
only:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ stages:
2929
REGISTRY_USER: "${CI_REGISTRY_USER}"
3030
REGISTRY_PASSWORD: "${CI_REGISTRY_PASSWORD}"
3131
REGISTRY: "${CI_REGISTRY}"
32-
DOCKER_NAME: "registry.gitlab.com/postgres-ai/custom-images/migration-tools"
32+
DOCKER_NAME: "${CI_REGISTRY}/${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}/migration-tools"
3333

3434
.only_var_template: &only_tag_release
3535
only:

0 commit comments

Comments
 (0)