commit 9eb09a171696c4eac7ca42fa3beadc5514502376
author Filip Pytloun <fpytloun@mirantis.com> Mon May 29 15:33:17 2017 +0000
committer Gerrit Code Review <gerrit2@5776b83a74fe> Mon May 29 15:33:19 2017 +0000
tree 24730f894ad5caa10ba12f2319e0fcbcaa01fdfa
parent 9b8eee65675b6a048ba8fec994a626303c070a69
parent 9d0fb125a9476095f09fb9be948c1f16452ee2f1

Merge "Switch to upstream postgres docker image for OSS tooling"

docker/swarm/stack/postgresql.yml

diff --git a/docker/swarm/stack/postgresql.yml b/docker/swarm/stack/postgresql.yml
index bdad6fb..7ae4052 100644
--- a/docker/swarm/stack/postgresql.yml
+++ b/docker/swarm/stack/postgresql.yml
@@ -1,7 +1,7 @@
 parameters:
   _param:
     docker_postgresql_replicas: 1
-    docker_image_postgresql: docker-sandbox.sandbox.mirantis.net/vstoiko/oss/postgresql:latest
+    docker_image_postgresql: library/postgres:9.6
     postgresql_admin_user: postgres
     postgresql_admin_user_password: postgrespassword
   docker:

postgresql/client/pushkin.yml

diff --git a/postgresql/client/pushkin.yml b/postgresql/client/pushkin.yml
index d768464..c6ec567 100644
--- a/postgresql/client/pushkin.yml
+++ b/postgresql/client/pushkin.yml
@@ -14,10 +14,13 @@
               enabled: true
               encoding: 'UTF8'
               locale: 'en_US'
-              template: 'hstore_enabled'
               users:
               - name: ${_param:pushkin_db_user}
                 password: ${_param:pushkin_db_user_password}
                 host: ${_param:pushkin_db_host}
                 createdb: true
                 rights: all privileges
+              extension:
+                hstore:
+                  enabled: true
+