aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQuentin Dufour <quentin@deuxfleurs.fr>2021-04-15 13:05:21 +0200
committerQuentin Dufour <quentin@deuxfleurs.fr>2021-04-15 13:05:21 +0200
commit3135c385054ebd4955c992a1c616eb20c97e0683 (patch)
treed00beb6d09f3f7857a1c5f960423e04ea5befa6f
parent87303033d115c1f4da67433c5adc01577311f4c3 (diff)
downloadinfrastructure-3135c385054ebd4955c992a1c616eb20c97e0683.tar.gz
infrastructure-3135c385054ebd4955c992a1c616eb20c97e0683.zip
Upgrade stolon
-rw-r--r--app/docker-compose.yml2
-rw-r--r--app/postgres/build/postgres/Dockerfile2
-rw-r--r--app/postgres/deploy/postgres.hcl6
3 files changed, 5 insertions, 5 deletions
diff --git a/app/docker-compose.yml b/app/docker-compose.yml
index 0d82cab..4195c48 100644
--- a/app/docker-compose.yml
+++ b/app/docker-compose.yml
@@ -98,7 +98,7 @@ services:
# https://packages.debian.org/fr/stretch/postgresql-all
PG_VERSION: 9.6+181+deb9u3
context: ./postgres/build/postgres
- image: superboum/amd64_postgres:v4
+ image: superboum/amd64_postgres:v5
backup-consul:
build:
diff --git a/app/postgres/build/postgres/Dockerfile b/app/postgres/build/postgres/Dockerfile
index 64fef61..4a9e280 100644
--- a/app/postgres/build/postgres/Dockerfile
+++ b/app/postgres/build/postgres/Dockerfile
@@ -6,7 +6,7 @@ RUN git clone https://github.com/sorintlab/stolon .
RUN git pull && git checkout ${STOLON_VERSION}
RUN go mod download
COPY 0001-Add-max-rate-to-pg_basebackup.patch .
-RUN git am 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
diff --git a/app/postgres/deploy/postgres.hcl b/app/postgres/deploy/postgres.hcl
index 6173cd6..5ce68a4 100644
--- a/app/postgres/deploy/postgres.hcl
+++ b/app/postgres/deploy/postgres.hcl
@@ -20,7 +20,7 @@ job "postgres9.6" {
driver = "docker"
config {
- image = "superboum/amd64_postgres:v4"
+ image = "superboum/amd64_postgres:v5"
network_mode = "host"
readonly_rootfs = false
command = "/usr/local/bin/stolon-sentinel"
@@ -39,7 +39,7 @@ job "postgres9.6" {
driver = "docker"
config {
- image = "superboum/amd64_postgres:v4"
+ image = "superboum/amd64_postgres:v5"
network_mode = "host"
readonly_rootfs = false
command = "/usr/local/bin/stolon-proxy"
@@ -81,7 +81,7 @@ job "postgres9.6" {
driver = "docker"
config {
- image = "superboum/amd64_postgres:v4"
+ image = "superboum/amd64_postgres:v5"
network_mode = "host"
readonly_rootfs = false
command = "/usr/local/bin/stolon-keeper"