Merge pull request #222 from phillxnet/221_harmonise_postgresql_rock-ons

add postgres-10.6.json to root.json & normalise with 9.5 variant. Fixes #221

postgres-10.6.json

@@ -1,34 +1,40 @@
 {
-    "PostgreSQL 10.6":{
-        "containers":{
-            "postgresql":{
+    "PostgreSQL 10.6": {
+        "description": "PostgreSQL (10.6), open-source relational DBMS.<p>Based on the official PostgreSQL docker image: <a href='https://hub.docker.com/_/postgres' target='_blank'>https://hub.docker.com/_/postgres</a>.</p><p><strong>Note: </strong>This rock-on requires Rockstor version 3.9.2-53 or later.</p>",
+        "version": "1.2",
+        "website": "https://www.postgresql.org",
+        "more_info": "<h4>Important locations inside docker image:</h4><p>Config. file:<code>/var/lib/pgsql/data/pg_hba.conf</code></p> <p>Databases: <code>/var/lib/pgsql/data</code></p> <p>Logs: <code>/var/log/postgresql</code></p>",
+        "volume_add_support": true,
+        "containers": {
+            "postgresql-10.6": {
                 "image": "postgres",
+                "launch_order": 1,
                 "tag": "10.6",
-                "launch_order":1,
-                "ports":{
-                    "5432":{
-                        "description":"PostgreSQL port. Suggested default: 5433",
-                        "host_default":5433,
-                        "label":"PostgreSQL port",
-                        "protocol":"tcp",
-                        "ui":false
+                "ports": {
+                    "5432": {
+                        "description": "PostgreSQL port. Suggested default: 5433 (Rockstor typically uses 5432 already)",
+                        "host_default": 5433,
+                        "label": "PostgreSQL port",
+                        "protocol": "tcp"
                     }
                 },
-                "volumes":{
-                    "/var/lib/postgresql/data":{
-                        "description":"Choose a share where the database should be stored. Eg: create a share called postgresql-share1 for this purpose alone. ",
-                        "label":"Data Storage"
+                "volumes": {
+                    "/var/lib/postgresql/data": {
+                        "description": "Choose a share where the database should be stored. E.g.: create a share called postgresql106-data for this purpose alone.",
+                        "label": "Data Storage"
+                    }
+                },
+                "environment": {
+                    "POSTGRES_USER": {
+                        "description": "Choose A Super User name for the PostgreSQL installation",
+                        "label": "SuperUser"
+                    },
+                    "POSTGRES_PASSWORD": {
+                        "description": "set a password for the Super User.",
+                        "label": "SuperUser password"
                     }
                 }
             }
-        },
-        "description": "PostgreSQL v10.6, open-source relational database management system. <p><strong>Note: </strong>This rock-on requires Rockstor version 3.9.2-51 or later.</p><p>Based on the official PostgreSQL docker image: <a href='https://hub.docker.com/_/postgres' target='_blank'>https://hub.docker.com/_/postgres</a>.",
-        "ui":{
-            "slug":""
-        },
-        "volume_add_support":true,
-        "more_info": "<h4>Important locations</h4><p>Configuration file:<code>/var/lib/pgsql/data/pg_hba.conf</code></p> <p>Databases: <code>/var/lib/pgsql/data</code></p> <p>Logs: <code>/var/log/postgresql</code></p>",
-        "website":"https://www.postgresql.org",
-        "version":"1.0"
+        }
     }
 }

root.json

@@ -52,6 +52,7 @@
     "Plexpy": "plexpy.json",
     "PocketMine": "pocketmine.json",
     "PostgreSQL 9.5": "postgres-9.5.json",
+    "PostgreSQL 10.6": "postgres-10.6.json",
     "Radarr": "radarr.json",
     "Resilio Sync": "resilioSync.json",
     "Rocket.Chat": "rocketchat.json",