change postgresql version 10.2 to 10 (#140)

* change postgresql version 10.2 to 10;
optimize make.sh of barman and pgpool for multiple versions support;

* update README.md

* fix typo of VALS to VARS

* handle package version by "apt-get install package=major_version\*" method

.travis.yml

@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 sudo: required
@@ -29,15 +29,15 @@ jobs:
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-9.5_pgpool-3.3_barman-2.3 ./tests/run.sh
       env:
         - NAME = postgres-extended-9.5_pgpool-3.3_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10.2_pgpool-3.7_barman-2.3 ./tests/run.sh
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10_pgpool-3.7_barman-2.3 ./tests/run.sh
       env:
-        - NAME = postgres-extended-10.2_pgpool-3.7_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10.2_pgpool-3.6_barman-2.3 ./tests/run.sh
+        - NAME = postgres-extended-10_pgpool-3.7_barman-2.3
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10_pgpool-3.6_barman-2.3 ./tests/run.sh
       env:
-        - NAME = postgres-extended-10.2_pgpool-3.6_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10.2_pgpool-3.3_barman-2.3 ./tests/run.sh
+        - NAME = postgres-extended-10_pgpool-3.6_barman-2.3
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-extended-10_pgpool-3.3_barman-2.3 ./tests/run.sh
       env:
-        - NAME = postgres-extended-10.2_pgpool-3.3_barman-2.3
+        - NAME = postgres-extended-10_pgpool-3.3_barman-2.3
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-9.6_pgpool-3.7_barman-2.3 ./tests/run.sh
       env:
         - NAME = postgres-9.6_pgpool-3.7_barman-2.3
@@ -56,15 +56,15 @@ jobs:
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-9.5_pgpool-3.3_barman-2.3 ./tests/run.sh
       env:
         - NAME = postgres-9.5_pgpool-3.3_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10.2_pgpool-3.7_barman-2.3 ./tests/run.sh
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10_pgpool-3.7_barman-2.3 ./tests/run.sh
       env:
-        - NAME = postgres-10.2_pgpool-3.7_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10.2_pgpool-3.6_barman-2.3 ./tests/run.sh
+        - NAME = postgres-10_pgpool-3.7_barman-2.3
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10_pgpool-3.6_barman-2.3 ./tests/run.sh
       env:
-        - NAME = postgres-10.2_pgpool-3.6_barman-2.3
-    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10.2_pgpool-3.3_barman-2.3 ./tests/run.sh
+        - NAME = postgres-10_pgpool-3.6_barman-2.3
+    - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=postgres-10_pgpool-3.3_barman-2.3 ./tests/run.sh
       env:
-        - NAME = postgres-10.2_pgpool-3.3_barman-2.3
+        - NAME = postgres-10_pgpool-3.3_barman-2.3
     - script: NO_COLOURS=1 DEBUG=1 TEST_COMBINATIONS=latest ./tests/run.sh
       env:
         - NAME = latest

README.md

@@ -59,13 +59,13 @@ Taking into account that PostDock project itself has versioning schema, all dock
 
 * `<postdock_version>` - semantic version without `bug-fix` component (can be `1.1`,`1.2`,...)
 * `<component>`, `<component_version>` - depends on component:
-    * `postgres`,`postgres-extended` - major and minor version without dot in between(can be `95`,`96`,`102`)
+    * `postgres`,`postgres-extended` - major and minor version without dot in between(can be `95`,`96`,`10`)
     * `pgpool` - major and minor version of component without dot in between(can be `33`,`36`,`37`)
     * `barman` - major version only (can be `2`)
 * `<sub_component>`, `<sub_component_version>` - depends on component:
     * for `postgres` - `repmgr` can be `3.2`
-    * for `barman` - `postgres` can be `9.6`, `10.2`
-    * for `pgpool` - `postgres` can be `9.6`, `10.2`
+    * for `barman` - `postgres` can be `9.6`, `10`
+    * for `pgpool` - `postgres` can be `9.6`, `10`
 
 Aliases are available **(not recommended to use for production)**:
 

docker-compose/latest.yml

@@ -1 +1 @@
-./postgres-10.2_pgpool-3.7_barman-2.3.yml
+./postgres-10_pgpool-3.7_barman-2.3.yml

docker-compose/postgres-10.2_pgpool-3.3_barman-2.3.yml → docker-compose/postgres-10_pgpool-3.3_barman-2.3.yml

@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
@@ -21,7 +21,7 @@ services:
     pgmaster:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 1 # Integer number of node (not required if can be extracted from NODE_NAME var, e.g. node-45 => 1045)
             NODE_NAME: node1 # Node name
@@ -59,7 +59,7 @@ services:
     pgslave1:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 2
             NODE_NAME: node2
@@ -83,7 +83,7 @@ services:
     pgslave2:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 3
             NODE_NAME: node3
@@ -106,7 +106,7 @@ services:
     pgslave3:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 4
             NODE_NAME: node4
@@ -130,7 +130,7 @@ services:
     pgslave4:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 5
             NODE_NAME: node5
@@ -152,7 +152,7 @@ services:
     backup:
         build:
             context: ../src
-            dockerfile: Barman-2.3-Postgres-10.2.Dockerfile
+            dockerfile: Barman-2.3-Postgres-10.Dockerfile
         environment:
             REPLICATION_USER: replication_user # default is replication_user
             REPLICATION_PASSWORD: replication_pass # default is replication_pass
@@ -171,7 +171,7 @@ services:
     pgpool:
         build:
             context: ../src
-            dockerfile: Pgpool-3.3-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.3-Postgres-10.Dockerfile
         environment:
             PCP_USER: pcp_user
             PCP_PASSWORD: pcp_pass
@@ -204,7 +204,7 @@ services:
     postgres_ext:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
           NODE_ID: 101 
           NODE_NAME: node101 # Node name
@@ -218,7 +218,7 @@ services:
     postgres_conf:
         build:
           context: ../src/
-          dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+          dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
           NODE_NAME: node-102 # Node name
           CLUSTER_NODE_NETWORK_NAME: postgres_conf # (default: hostname of the node)
@@ -232,7 +232,7 @@ services:
     pgpool_conf:
         build:
             context: ../src
-            dockerfile: Pgpool-3.3-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.3-Postgres-10.Dockerfile
         environment:
             PCP_USER: pcp_user
             PCP_PASSWORD: pcp_pass
@@ -251,7 +251,7 @@ services:
     pgmaster2:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
 
             NODE_ID: 1
@@ -272,7 +272,7 @@ services:
     pgpool2:
         build:
             context: ../src
-            dockerfile: Pgpool-3.3-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.3-Postgres-10.Dockerfile
         depends_on:
             - pgmaster
             - pgmaster2

docker-compose/postgres-10.2_pgpool-3.6_barman-2.3.yml → docker-compose/postgres-10_pgpool-3.6_barman-2.3.yml

@@ -1,7 +1,7 @@
 
 ##########################################################################
 ##                         AUTO-GENERATED FILE                          ##
-##               BUILD_NUMBER=Fri Mar  9 17:48:14 +07 2018              ##
+##               BUILD_NUMBER=Sun Apr  8 00:03:15 CST 2018              ##
 ##########################################################################
 
 version: '2'
@@ -21,7 +21,7 @@ services:
     pgmaster:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 1 # Integer number of node (not required if can be extracted from NODE_NAME var, e.g. node-45 => 1045)
             NODE_NAME: node1 # Node name
@@ -59,7 +59,7 @@ services:
     pgslave1:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 2
             NODE_NAME: node2
@@ -83,7 +83,7 @@ services:
     pgslave2:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 3
             NODE_NAME: node3
@@ -106,7 +106,7 @@ services:
     pgslave3:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 4
             NODE_NAME: node4
@@ -130,7 +130,7 @@ services:
     pgslave4:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
             NODE_ID: 5
             NODE_NAME: node5
@@ -152,7 +152,7 @@ services:
     backup:
         build:
             context: ../src
-            dockerfile: Barman-2.3-Postgres-10.2.Dockerfile
+            dockerfile: Barman-2.3-Postgres-10.Dockerfile
         environment:
             REPLICATION_USER: replication_user # default is replication_user
             REPLICATION_PASSWORD: replication_pass # default is replication_pass
@@ -171,7 +171,7 @@ services:
     pgpool:
         build:
             context: ../src
-            dockerfile: Pgpool-3.6-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.6-Postgres-10.Dockerfile
         environment:
             PCP_USER: pcp_user
             PCP_PASSWORD: pcp_pass
@@ -204,7 +204,7 @@ services:
     postgres_ext:
         build:
             context: ../src
-            dockerfile: Postgres-extended-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-extended-10-Repmgr-3.2.Dockerfile
         environment:
           NODE_ID: 101 
           NODE_NAME: node101 # Node name
@@ -218,7 +218,7 @@ services:
     postgres_conf:
         build:
           context: ../src/
-          dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+          dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
           NODE_NAME: node-102 # Node name
           CLUSTER_NODE_NETWORK_NAME: postgres_conf # (default: hostname of the node)
@@ -232,7 +232,7 @@ services:
     pgpool_conf:
         build:
             context: ../src
-            dockerfile: Pgpool-3.6-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.6-Postgres-10.Dockerfile
         environment:
             PCP_USER: pcp_user
             PCP_PASSWORD: pcp_pass
@@ -251,7 +251,7 @@ services:
     pgmaster2:
         build:
             context: ../src
-            dockerfile: Postgres-10.2-Repmgr-3.2.Dockerfile
+            dockerfile: Postgres-10-Repmgr-3.2.Dockerfile
         environment:
 
             NODE_ID: 1
@@ -272,7 +272,7 @@ services:
     pgpool2:
         build:
             context: ../src
-            dockerfile: Pgpool-3.6-Postgres-10.2.Dockerfile
+            dockerfile: Pgpool-3.6-Postgres-10.Dockerfile
         depends_on:
             - pgmaster
             - pgmaster2