aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@dufour.io>2021-07-02 13:10:49 +0200
committerQuentin Dufour <quentin@dufour.io>2021-07-02 13:10:49 +0200
commit2d61f1449dbcb502ba07bda6bdea387fdef2cbda (patch)
tree7bc83ac5f351439440c5bd3bbda3c7dbc7a0dc94
parent42c020e00b87750b606a5fbf0cc35cc489faa351 (diff)
downloadinfrastructure-matrix_s3.tar.gz
infrastructure-matrix_s3.zip
Upgrade postgresqlmatrix_s3
-rw-r--r--app/docker-compose.yml6
-rw-r--r--app/postgres/build/postgres/Dockerfile6
2 files changed, 3 insertions, 9 deletions
diff --git a/app/docker-compose.yml b/app/docker-compose.yml
index 9905a57..82bacd5 100644
--- a/app/docker-compose.yml
+++ b/app/docker-compose.yml
@@ -96,11 +96,9 @@ services:
build:
args:
# https://github.com/sorintlab/stolon/releases
- STOLON_VERSION: 2d0b8e516a4eaec01f3a9509cdc50a1d4ce8709c
- # https://packages.debian.org/fr/stretch/postgresql-all
- PG_VERSION: 9.6+181+deb9u3
+ STOLON_VERSION: 057389f7e484ee1d5c1e1a7020256020e7413c87
context: ./postgres/build/postgres
- image: superboum/amd64_postgres:v5
+ image: superboum/amd64_postgres:v6
backup-consul:
build:
diff --git a/app/postgres/build/postgres/Dockerfile b/app/postgres/build/postgres/Dockerfile
index 4a9e280..71b24b5 100644
--- a/app/postgres/build/postgres/Dockerfile
+++ b/app/postgres/build/postgres/Dockerfile
@@ -9,10 +9,6 @@ COPY 0001-Add-max-rate-to-pg_basebackup.patch .
RUN git apply 0001-Add-max-rate-to-pg_basebackup.patch
RUN make && chmod +x /stolon/bin/*
-FROM amd64/debian:stretch
-ARG PG_VERSION
-RUN apt-get update && \
- apt-get install -y postgresql-all=${PG_VERSION}
+FROM postgres:13.3-alpine
COPY --from=builder /stolon/bin /usr/local/bin
-USER postgres