Skip to content

Commit bcb4427

Browse files
pauninpaunin
authored
Fix repmgr version (#206)
1 parent 2f7fa65 commit bcb4427

28 files changed

+128
-55
lines changed

‎make/barman/make.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
echo ">>> Making barman"
22

33
for VALS in "BARMAN_VERSION=2.3 BARMAN_PACKAGE_VERSION=2.3-2.pgdg80+1"\
4-
"BARMAN_VERSION=2.4 BARMAN_LATEST=1"; do
4+
"BARMAN_VERSION=2.4 BARMAN_PACKAGE_VERSION=2.4-1.pgdg80+1"; do
55
eval $VALS
66

77
for PG_CLIENT_VERSION in 9.6 10; do

‎make/pgpool/make.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ echo ">>> Making pgpool"
22

33
for VALS in "PGPOOL_VERSION=3.3 PGPOOL_PACKAGE_VERSION=3.3.4-1.pgdg70+1" \
44
"PGPOOL_VERSION=3.6 PGPOOL_PACKAGE_VERSION=3.6.7-1.pgdg80+1" \
5-
"PGPOOL_VERSION=3.7 PGPOOL_LATEST=1"; do
5+
"PGPOOL_VERSION=3.7 PGPOOL_PACKAGE_VERSION=3.7.5-2.pgdg80+1"; do
66
eval $VALS
77

88
for PG_CLIENT_VERSION in 9.6 10; do
@@ -14,3 +14,4 @@ for VALS in "PGPOOL_VERSION=3.3 PGPOOL_PACKAGE_VERSION=3.3.4-1.pgdg70+1" \
1414
template $FILE_FROM $FILE_TO $VALS
1515
done
1616
done
17+
unset PGPOOL_VERSION PGPOOL_PACKAGE_VERSION VALS

‎make/postgres/make.sh‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
echo ">>> Making postgres"
22

33

4-
for VALS in "POSTGRES_VERSION=9.5 REPMGR_VERSION=3.2 REPMGR_PACKAGE_VERSION=3.3.2-1.pgdg80%2b1" \
5-
"POSTGRES_VERSION=9.6 REPMGR_VERSION=3.2 REPMGR_PACKAGE_VERSION=3.3.2-1.pgdg80%2b1" \
6-
"POSTGRES_VERSION=10 REPMGR_VERSION=3.2 REPMGR_PACKAGE_VERSION=3.3.2-1.pgdg80%2b1" \
7-
"POSTGRES_VERSION=9.5 REPMGR_VERSION=4.0 REPMGR_PACKAGE_VERSION=4.0.6 REPMGR_LATEST=1" \
8-
"POSTGRES_VERSION=9.6 REPMGR_VERSION=4.0 REPMGR_PACKAGE_VERSION=4.0.6 REPMGR_LATEST=1" \
9-
"POSTGRES_VERSION=10 REPMGR_VERSION=4.0 REPMGR_PACKAGE_VERSION=4.0.6 REPMGR_LATEST=1"; do
4+
for VALS in "POSTGRES_VERSION=9.5 REPMGR_VERSION=3.2 REPMGR_SYNTAX_V3=1 REPMGR_PACKAGE_VERSION=3.3.2-1.pgdg80+1" \
5+
"POSTGRES_VERSION=9.6 REPMGR_VERSION=3.2 REPMGR_SYNTAX_V3=1 REPMGR_PACKAGE_VERSION=3.3.2-1.pgdg80+1" \
6+
"POSTGRES_VERSION=10 REPMGR_VERSION=3.2 REPMGR_SYNTAX_V3=1 REPMGR_PACKAGE_VERSION=3.3.2-1.pgdg80+1" \
7+
"POSTGRES_VERSION=9.5 REPMGR_VERSION=4.0 REPMGR_SYNTAX_V4=1 REPMGR_PACKAGE_VERSION=4.0.6-2.pgdg80+1" \
8+
"POSTGRES_VERSION=9.6 REPMGR_VERSION=4.0 REPMGR_SYNTAX_V4=1 REPMGR_PACKAGE_VERSION=4.0.6-2.pgdg80+1" \
9+
"POSTGRES_VERSION=10 REPMGR_VERSION=4.0 REPMGR_SYNTAX_V4=1 REPMGR_PACKAGE_VERSION=4.0.6-2.pgdg+1"; do
1010
eval $VALS
1111
FILE_FROM="./src/includes/dockerfile/Postgres-$POSTGRES_VERSION-Repmgr-$REPMGR_VERSION.part.Dockerfile"
1212
FILE_FROM_EXT="./src/includes/dockerfile/Postgres-extended-$POSTGRES_VERSION-Repmgr-$REPMGR_VERSION.part.Dockerfile"
@@ -20,4 +20,6 @@ for VALS in "POSTGRES_VERSION=9.5 REPMGR_VERSION=3.2 REPMGR_PACKAGE_VERSION=3.3.
2020

2121
template $FILE_FROM $FILE_TO_EXT $VALS
2222
template $FILE_FROM_EXT $FILE_TO_EXT
23+
24+
unset REPMGR_SYNTAX_V4 REPMGR_SYNTAX_V3 POSTGRES_VERSION REPMGR_VERSION REPMGR_PACKAGE_VERSION
2325
done

‎src/Barman-2.3-Postgres-10.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
##########################################################################
33
## AUTO-GENERATED FILE ##
4-
## BUILD_NUMBER=Sat 2 Jun 2018 15:28:51 +07 ##
4+
## BUILD_NUMBER=Sun 16 Dec 2018 00:29:32 +08 ##
55
##########################################################################
66

77
FROM golang:1.8-jessie

‎src/Barman-2.3-Postgres-9.6.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
##########################################################################
33
## AUTO-GENERATED FILE ##
4-
## BUILD_NUMBER=Sat 2 Jun 2018 15:28:51 +07 ##
4+
## BUILD_NUMBER=Sun 16 Dec 2018 00:29:32 +08 ##
55
##########################################################################
66

77
FROM golang:1.8-jessie

‎src/Barman-2.4-Postgres-10.Dockerfile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
##########################################################################
33
## AUTO-GENERATED FILE ##
4-
## BUILD_NUMBER=Sat 2 Jun 2018 15:28:51 +07 ##
4+
## BUILD_NUMBER=Sun 16 Dec 2018 00:29:32 +08 ##
55
##########################################################################
66

77
FROM golang:1.8-jessie
@@ -26,7 +26,10 @@ RUN wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
2626

2727
RUN apt-get install -y postgresql-client-10
2828

29-
RUN apt-get install -y barman=2.4\*
29+
30+
RUN TEMP_DEB="$(mktemp)" && \
31+
wget -O "$TEMP_DEB" "http://atalia.postgresql.org/morgue/b/barman/barman_2.4-1.pgdg80+1_all.deb" && \
32+
(dpkg -i "$TEMP_DEB" || apt-get install -y -f) && rm -f "$TEMP_DEB"
3033

3134
RUN apt-get -y install cron
3235
ADD barman/crontab /etc/cron.d/barman

‎src/Barman-2.4-Postgres-9.6.Dockerfile‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
##########################################################################
33
## AUTO-GENERATED FILE ##
4-
## BUILD_NUMBER=Sat 2 Jun 2018 15:28:51 +07 ##
4+
## BUILD_NUMBER=Sun 16 Dec 2018 00:29:32 +08 ##
55
##########################################################################
66

77
FROM golang:1.8-jessie
@@ -26,7 +26,10 @@ RUN wget -q https://www.postgresql.org/media/keys/ACCC4CF8.asc -O - | apt-key a
2626

2727
RUN apt-get install -y postgresql-client-9.6
2828

29-
RUN apt-get install -y barman=2.4\*
29+
30+
RUN TEMP_DEB="$(mktemp)" && \
31+
wget -O "$TEMP_DEB" "http://atalia.postgresql.org/morgue/b/barman/barman_2.4-1.pgdg80+1_all.deb" && \
32+
(dpkg -i "$TEMP_DEB" || apt-get install -y -f) && rm -f "$TEMP_DEB"
3033

3134
RUN apt-get -y install cron
3235
ADD barman/crontab /etc/cron.d/barman

‎src/Pgpool-3.3-Postgres-10.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
##########################################################################
33
## AUTO-GENERATED FILE ##
4-
## BUILD_NUMBER=Sat 2 Jun 2018 15:28:51 +07 ##
4+
## BUILD_NUMBER=Sun 16 Dec 2018 15:57:54 +08 ##
55
##########################################################################
66

77
FROM debian:jessie

‎src/Pgpool-3.3-Postgres-9.6.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
##########################################################################
33
## AUTO-GENERATED FILE ##
4-
## BUILD_NUMBER=Sat 2 Jun 2018 15:28:51 +07 ##
4+
## BUILD_NUMBER=Sun 16 Dec 2018 15:57:54 +08 ##
55
##########################################################################
66

77
FROM debian:jessie

‎src/Pgpool-3.6-Postgres-10.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
##########################################################################
33
## AUTO-GENERATED FILE ##
4-
## BUILD_NUMBER=Sat 2 Jun 2018 15:28:51 +07 ##
4+
## BUILD_NUMBER=Sun 16 Dec 2018 15:57:54 +08 ##
55
##########################################################################
66

77
FROM debian:jessie

0 commit comments

Comments
 (0)