Merge pull request #22 from xenit-eu/master

thijslemmens · web-flow · commit 2b3942a3f85c · 2019-12-18T14:23:10.000+01:00
new release adding wal-g support and maintenance updates
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,9 @@
 .gradle/
 .idea/
+.settings/
+.project
+.vscode/
 pglogical.iml
 **/build
+**/bin
+**/.classpath
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,16 @@
 # Xenit PostgreSQL docker image changelog
 
+## WAL-G support and maintenance releases - 2019-12-18
+
+- [#19](https://github.com/xenit-eu/docker-postgres/issues/19): Update to [latest maintenance releases](https://www.postgresql.org/about/news/1994/)
+- [#11](https://github.com/xenit-eu/docker-postgres/issues/11): Add support for WAL-G
+
 ## Migrate to xenit/postgres - 2019-10-01
+
 - Docker image can now be pulled from xenit/postgres instead of ~~xeniteu/postgres~~
 
 ## 11.5 - 2019-08-21
+
 - [#12](https://github.com/xenit-eu/docker-postgres/issues/12): Update to [new maintenance release](https://www.postgresql.org/about/news/1960/)
 
 ## 11.4 - 2019-06-25
@@ -14,4 +21,4 @@
 
 ## 11.2 - 2019-02-20
 
-- [DOCKER-149](https://xenitsupport.jira.com/browse/DOCKER-149): Update to latest release PG
+- [DOCKER-149](https://xenitsupport.jira.com/browse/DOCKER-149): Update to latest release PG
diff --git a/README.md b/README.md
@@ -77,4 +77,5 @@ Setting `PGHBAREPLACE=true` will remove the pg_hba.conf and will search for all
 
 This image is based on [github.com/docker-library/postgres](https://github.com/docker-library/postgres/) and extends it with:
 
-* pglogical
+* [pglogical](https://www.2ndquadrant.com/en/resources/pglogical/)
+* [WAL-G](https://github.com/wal-g/wal-g)
diff --git a/build.gradle b/build.gradle
@@ -4,36 +4,36 @@ plugins {
 
 project(':9.4') {
     project.ext {
-        baseImage = 'postgres:9.4.24'
-        tags = ['9.4', '9.4.24']
+        baseImage = 'postgres:9.4.25'
+        tags = ['9.4', '9.4.25']
     }
 }
 
 project(':9.5') {
     project.ext {
-        baseImage = 'postgres:9.5.19'
-        tags = ['9.5', '9.5.19']
+        baseImage = 'postgres:9.5.20'
+        tags = ['9.5', '9.5.20']
     }
 }
 
 project(':9.6') {
     project.ext {
-        baseImage = 'postgres:9.6.15'
-        tags = ['9', '9.6', '9.6.15']
+        baseImage = 'postgres:9.6.16'
+        tags = ['9', '9.6', '9.6.16']
     }
 }
 
 project(':10') {
     project.ext {
-        baseImage = 'postgres:10.10'
-        tags = ['10', '10.10']
+        baseImage = 'postgres:10.11'
+        tags = ['10', '10.11']
     }
 }
 
 project(':11') {
     project.ext {
-        baseImage = 'postgres:11.5'
-        tags = ['11', '11.5', 'latest']
+        baseImage = 'postgres:11.6'
+        tags = ['11', '11.6', 'latest']
     }
 }
 
@@ -45,6 +45,7 @@ subprojects {
 
     project.ext {
         pgVersion = project.projectDir.name
+        walgVersion = 'v0.2.14'
     }
 
     apply plugin: 'eu.xenit.docker'
@@ -99,7 +100,7 @@ subprojects {
     }
 
     buildDockerImage {
-        buildArgs = ['PGVERSION': project.pgVersion, 'BASEIMAGE': project.baseImage]
+        buildArgs = ['PGVERSION': project.pgVersion, 'BASEIMAGE': project.baseImage, 'WALGVERSION': project.walgVersion]
     }
 
     dockerCompose.isRequiredBy(test)
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
@@ -1,18 +1,19 @@
 ARG BASEIMAGE
 
+
 FROM $BASEIMAGE
 MAINTAINER thijs.lemmens@xenit.eu
 
 ARG PGVERSION
-
-ARG INSTALL_PGLOGICAL
+ARG WALGVERSION
 
 # Only install pglogical if configured
 RUN apt-get update && apt-get install -y wget gnupg \
   && echo "deb [arch=amd64] http://packages.2ndquadrant.com/pglogical/apt/ stretch-2ndquadrant main" > /etc/apt/sources.list.d/2ndquadrant.list \
   && wget --quiet -O - http://packages.2ndquadrant.com/pglogical/apt/AA7A6805.asc | apt-key add - \
   && apt-get update \
   && apt-get install -y postgresql-${PGVERSION}-pglogical \
+  && wget -qO- https://github.com/wal-g/wal-g/releases/download/${WALGVERSION}/wal-g.linux-amd64.tar.gz | tar zxv -C /usr/bin/ \
   && apt-get remove -y wget \
   && rm -rf /var/lib/apt/lists/*
 

Original file line number	Diff line number	Diff line change
`@@ -4,36 +4,36 @@ plugins {`
`4`	`4`
`5`	`5`	`project(':9.4') {`
`6`	`6`	`project.ext {`
`7`		`- baseImage = 'postgres:9.4.24'`
`8`		`- tags = ['9.4', '9.4.24']`
	`7`	`+ baseImage = 'postgres:9.4.25'`
	`8`	`+ tags = ['9.4', '9.4.25']`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`project(':9.5') {`
`13`	`13`	`project.ext {`
`14`		`- baseImage = 'postgres:9.5.19'`
`15`		`- tags = ['9.5', '9.5.19']`
	`14`	`+ baseImage = 'postgres:9.5.20'`
	`15`	`+ tags = ['9.5', '9.5.20']`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`project(':9.6') {`
`20`	`20`	`project.ext {`
`21`		`- baseImage = 'postgres:9.6.15'`
`22`		`- tags = ['9', '9.6', '9.6.15']`
	`21`	`+ baseImage = 'postgres:9.6.16'`
	`22`	`+ tags = ['9', '9.6', '9.6.16']`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`project(':10') {`
`27`	`27`	`project.ext {`
`28`		`- baseImage = 'postgres:10.10'`
`29`		`- tags = ['10', '10.10']`
	`28`	`+ baseImage = 'postgres:10.11'`
	`29`	`+ tags = ['10', '10.11']`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`project(':11') {`
`34`	`34`	`project.ext {`
`35`		`- baseImage = 'postgres:11.5'`
`36`		`- tags = ['11', '11.5', 'latest']`
	`35`	`+ baseImage = 'postgres:11.6'`
	`36`	`+ tags = ['11', '11.6', 'latest']`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
`@@ -45,6 +45,7 @@ subprojects {`
`45`	`45`
`46`	`46`	`project.ext {`
`47`	`47`	`pgVersion = project.projectDir.name`
	`48`	`+ walgVersion = 'v0.2.14'`
`48`	`49`	`}`
`49`	`50`
`50`	`51`	`apply plugin: 'eu.xenit.docker'`
`@@ -99,7 +100,7 @@ subprojects {`
`99`	`100`	`}`
`100`	`101`
`101`	`102`	`buildDockerImage {`
`102`		`- buildArgs = ['PGVERSION': project.pgVersion, 'BASEIMAGE': project.baseImage]`
	`103`	`+ buildArgs = ['PGVERSION': project.pgVersion, 'BASEIMAGE': project.baseImage, 'WALGVERSION': project.walgVersion]`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`dockerCompose.isRequiredBy(test)`