Skip to content

Commit

Permalink
added nominatim extension to repmgr image (#162)
Browse files Browse the repository at this point in the history 
* added nominatim extension to repmgr image

* revert changes to generated files

* add nominatim.so to tests

* result of ./make/make.sh

* fix sh script

* fixed generated files

* resolve issues
  • Loading branch information
@gabyshev @paunin
gabyshev authored and paunin committed Jun 2, 2018
1 parent 1424edc commit 1543500
Show file tree
Hide file tree
Showing 57 changed files with 83 additions and 63 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Thu May 31 15:23:48 +07 2018 ##
## BUILD_NUMBER=Fri Jun 1 13:38:15 +07 2018 ##
##########################################################################

sudo: required
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-10_pgpool-3.3_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-10_pgpool-3.3_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-10_pgpool-3.6_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-10_pgpool-3.6_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-10_pgpool-3.7_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-10_pgpool-3.7_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-9.5_pgpool-3.3_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-9.5_pgpool-3.3_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-9.5_pgpool-3.6_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-9.5_pgpool-3.6_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-9.5_pgpool-3.7_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-9.5_pgpool-3.7_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-9.6_pgpool-3.3_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-9.6_pgpool-3.3_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-9.6_pgpool-3.6_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-9.6_pgpool-3.6_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-9.6_pgpool-3.7_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-9.6_pgpool-3.7_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-10_pgpool-3.3_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-10_pgpool-3.3_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-10_pgpool-3.6_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-10_pgpool-3.6_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-10_pgpool-3.7_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-10_pgpool-3.7_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-9.5_pgpool-3.3_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-9.5_pgpool-3.3_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-9.5_pgpool-3.6_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-9.5_pgpool-3.6_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-9.5_pgpool-3.7_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-9.5_pgpool-3.7_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-9.6_pgpool-3.3_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-9.6_pgpool-3.3_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-9.6_pgpool-3.6_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-9.6_pgpool-3.6_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-9.6_pgpool-3.7_barman-2.3.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
2 changes: 1 addition & 1 deletion docker-compose/postgres-extended-9.6_pgpool-3.7_barman-2.4.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

version: '2'
Expand Down
3 changes: 2 additions & 1 deletion make/make.sh
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Script to build final Dockerfile-s for different versions of components
#!/bin/bash

set -e

BUILD_NUMBER=`date`
Expand Down
2 changes: 1 addition & 1 deletion src/Barman-2.3-Postgres-10.Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

FROM golang:1.8-jessie
Expand Down
2 changes: 1 addition & 1 deletion src/Barman-2.3-Postgres-9.6.Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

FROM golang:1.8-jessie
Expand Down
2 changes: 1 addition & 1 deletion src/Barman-2.4-Postgres-10.Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

FROM golang:1.8-jessie
Expand Down
2 changes: 1 addition & 1 deletion src/Barman-2.4-Postgres-9.6.Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

FROM golang:1.8-jessie
Expand Down
2 changes: 1 addition & 1 deletion src/Pgpool-3.3-Postgres-10.Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

FROM debian:jessie
Expand Down
2 changes: 1 addition & 1 deletion src/Pgpool-3.3-Postgres-9.6.Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

##########################################################################
## AUTO-GENERATED FILE ##
## BUILD_NUMBER=Mon May 28 16:58:37 +07 2018 ##
## BUILD_NUMBER=Thu May 31 14:36:44 +07 2018 ##
##########################################################################

FROM debian:jessie
Expand Down
Loading

0 comments on commit 1543500

Please sign in to comment.