8000 Merge pull request #24 from xenit-eu/master · xenit-eu/docker-postgres@0e3b1b2 · GitHub
[go: up one dir, main page]
Skip to content

Commit 0e3b1b2

Browse files
thijslemmensthijslemmens
authored
Merge pull request #24 from xenit-eu/master
Release PG12 image and service pack update
2 parents 2b3942a + 226a370 commit 0e3b1b2

File tree

3 files changed

+20
-15
lines changed

3 files changed

+20
-15
lines changed

‎build.gradle

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,43 @@ plugins {
44

55
project(':9.4') {
66
project.ext {
7-
baseImage = 'postgres:9.4.25'
8-
tags = ['9.4', '9.4.25']
7+
baseImage = 'postgres:9.4.26'
8+
tags = ['9.4', '9.4.26']
99
}
1010
}
1111

1212
project(':9.5') {
1313
project.ext {
14-
baseImage = 'postgres:9.5.20'
15-
tags = ['9.5', '9.5.20']
14+
baseImage = 'postgres:9.5.21'
15+
tags = ['9.5', '9.5.21']
1616
}
1717
}
1818

1919
project(':9.6') {
2020
project.ext {
21-
baseImage = 'postgres:9.6.16'
22-
tags = ['9', '9.6', '9.6.16']
21+
baseImage = 'postgres:9.6.17'
22+
tags = ['9', '9.6', '9.6.17']
2323
}
2424
}
2525

2626
project(':10') {
2727
project.ext {
28-
baseImage = 'postgres:10.11'
29-
tags = ['10', '10.11']
28+
baseImage = 'postgres:10.12'
29+
tags = ['10', '10.12']
3030
}
3131
}
3232

3333
project(':11') {
3434
project.ext {
35-
baseImage = 'postgres:11.6'
36-
tags = ['11', '11.6', 'latest']
35+
baseImage = 'postgres:11.7'
36+
tags = ['11', '11.7']
37+
}
38+
}
39+
40+
project(':12') {
41+
project.ext {
42+
baseImage = 'postgres:12.2'
43+
tags = ['12', '11.2', 'latest']
3744
}
3845
}
3946

‎settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
rootProject.name = 'postgres'
22

3-
include '9.4', '9.5', '9.6', '10', '11'
3+
include '9.4', '9.5', '9.6', '10', '11', '12'

‎src/main/docker/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ ARG PGVERSION
88
ARG WALGVERSION
99

1010
# Only install pglogical if configured
11-
RUN apt-get update && apt-get install -y wget gnupg \
12-
&& echo "deb [arch=amd64] http://packages.2ndquadrant.com/pglogical/apt/ stretch-2ndquadrant main" > /etc/apt/sources.list.d/2ndquadrant.list \
13-
&& wget --quiet -O - http://packages.2ndquadrant.com/pglogical/apt/AA7A6805.asc | apt-key add - \
14-
&& apt-get update \
11+
RUN apt-get update && apt-get install -y wget \
12+
&& wget -q https://access.2ndquadrant.com/api/repository/dl/default/release/deb | bash \
1513
&& apt-get install -y postgresql-${PGVERSION}-pglogical \
1614
&& wget -qO- https://github.com/wal-g/wal-g/releases/download/${WALGVERSION}/wal-g.linux-amd64.tar.gz | tar zxv -C /usr/bin/ \
1715
&& apt-get remove -y wget \

0 commit comments

Comments
 (0)
0