From cb00f462ed1805198d281414d5af674a4c74072f Mon Sep 17 00:00:00 2001
From: vanuan <vanuan@gmail.com>
Date: Sun, 1 May 2016 23:53:26 +0300
Subject: [PATCH] Finish postgres

---
 config/connections.js |  4 ++--
 docker-compose.yml    | 25 ++++++++++++++-----------
 production.yml        | 14 ++++++++++++++
 3 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 production.yml

diff --git a/config/connections.js b/config/connections.js
index 3094abe..812ec3a 100644
--- a/config/connections.js
+++ b/config/connections.js
@@ -82,8 +82,8 @@ module.exports.connections = {
   ***************************************************************************/
   postgres: {
     adapter: 'sails-postgresql',
-    host: 'postgres',
-    user: 'postgres', // optional
+    host: process.env.PG,
+    user: 'postgres',
     //password: '', // optional
     //database: 'sails' //optional
   }
diff --git a/docker-compose.yml b/docker-compose.yml
index 736274f..8405dbb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,27 +1,29 @@
 version: '2'
 services:
-  edr:
+  edr-api:
     build: .
     ports:
     - 81:80
     environment:
       NODE_ENV: production
       PORT: 80
+      PG: edr-db
     depends_on:
-    - postgres
-    - edr-migrations
+    - edr-db
+    - redis
 
-  postgres:
+  edr-db:
     image: kiasaki/alpine-postgres:9.5
 
   edr-uploader:
-#    image: 'vanuan/edrpou-uploader:latest'
     build: ../edr-uploader
     volumes:
-    - ../edr-uploader/data:/data/
+    - ./data:/data/edr/
     depends_on:
-    - postgres
-    - edr
+    - edr-db
+    - edr-migrations
+    environment:
+      PG_CONNECTION_STRING: postgres://postgres@edr-db/postgres
 
   redis:
     image: 'redis'
@@ -32,8 +34,9 @@ services:
       - /data
 
   edr-migrations:
-    #image: vanuan/edrpou-migrations
     build: ../edr-migrations
-    command: sh -c '/wait-for-it.sh -t 100 postgres:5432 && npm install && knex migrate:latest'
+    command: sh -c '/wait-for-it.sh -t 100 edr-db:5432 && npm install && knex migrate:latest'
     depends_on:
-      - postgres
+      - edr-db
+    environment:
+      PG_CONNECTION_STRING: postgres://postgres@edr-db/postgres
diff --git a/production.yml b/production.yml
new file mode 100644
index 0000000..a09fe73
--- /dev/null
+++ b/production.yml
@@ -0,0 +1,14 @@
+version: '2'
+services:
+  edr-api:
+    image: 'vanuan/edrpou-api:latest'
+    ports:
+    - 80:80
+
+  edr-uploader:
+    image: 'vanuan/edrpou-uploader:latest'
+    volumes:
+    - /root:/data/edr/
+
+  edr-migrations:
+    image: vanuan/edrpou-migrations:latest