From 11735b2bc4019fb5d87712f954913a09c79827ea Mon Sep 17 00:00:00 2001
From: Blair Vanderlugt <blair.vanderlugt@gmail.com>
Date: Wed, 18 Aug 2021 13:56:25 -0400
Subject: [PATCH] use postgres config

---
 .gitignore                  |  1 +
 docker-compose.override.yml | 60 ++-----------------------------------
 docker-compose.yml          |  8 +++--
 3 files changed, 9 insertions(+), 60 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3fb25a37..9fbe447c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ build/
 **/.venv
 .idea
 **/.vim
+docker-stack.yml
diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 876720d6..40d4c15b 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -33,13 +33,13 @@ services:
       POSTGRES_HOST_AUTH_METHOD: trust # for postgres user access w/o password. Obvioulsy not safe but allows easy elevated debugging.  
     ports:
       - ${DEV_POSTGRES_PORT:-63432}:5432
+    volumes:
+      - ./scripts/initdb/create_db.sql:/docker-entrypoint-initdb.d/1-create_all_db.sql 
 
   pgadmin:
     ports:
       - "5050:5050"
-        #    depends_on:
-        #      - postgres 
-        #
+
   flower:
     ports:
       - "5555:5555"
@@ -71,65 +71,15 @@ services:
       - traefik.http.routers.${STACK_NAME?Variable not set}-frontend-http.rule=PathPrefix(`/`)
       - traefik.http.services.${STACK_NAME?Variable not set}-frontend.loadbalancer.server.port=80
         
-        #contract-migration:
-        #  depends_on:
-        #    - eth
-        #    - postgres
-        #    - redis
-        #    - cic-eth-tasker
-
-        #cic-cache-tracker:
-        #  depends_on:
-        #    - redis
-        #    - postgres
-        #    - eth
-
-        #cic-cache-tasker:
-        #  depends_on:
-        #    - redis
-        #    - postgres
-        #    - eth
-
   cic-cache-server:
     ports:
       - "63313:8000"
-        #depends_on:
-        #  - postgres
     labels:
       - traefik.enable=true
       - traefik.constraint-label-stack=${TRAEFIK_TAG?Variable not set}
       - traefik.http.routers.${STACK_NAME?Variable not set}-cache-http.rule=PathPrefix(`/`)
       - traefik.http.services.${STACK_NAME?Variable not set}-cache.loadbalancer.server.port=63313
 
-        #cic-eth-tasker:
-        #  depends_on:
-        #    - eth
-        #    - postgres
-        #    - redis
-
-        #cic-eth-tracker:
-        #  depends_on:
-        #    - eth
-        #    - postgres
-        #    - redis
-
-        #cic-eth-dispatcher:
-        #  depends_on:
-        #    - eth
-        #    - postgres
-        #    - redis
-
-        #cic-eth-retrier:
-        #  depends_on:
-        #    - eth
-        #    - postgres
-        #    - redis
-
-        #cic-notify-tasker:
-        #  depends_on:
-        #    - postgres
-        #    - redis
-
   cic-meta-server:
     ports:
       - ${HTTP_PORT_CIC_META:-63380}:8000
@@ -164,10 +114,6 @@ services:
       - traefik.http.routers.${STACK_NAME?Variable not set}-user-http.rule=PathPrefix(`/`)
       - traefik.http.services.${STACK_NAME?Variable not set}-user.loadbalancer.server.port=63415
 
-        # cic-user-tasker:
-        #   depends_on:
-        #     - postgres
-        #     - redis
 
 networks:
   traefik-public:
diff --git a/docker-compose.yml b/docker-compose.yml
index 5fcfe098..a74b0517 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -129,13 +129,15 @@ services:
     ports:
       - 5432
     command: [ "-c", "max_connections=200" ]
+    volumes:
+      - postgres-db:/var/lib/postgresql/data
+    configs:
+      - source: create_db.sql
+        target: /docker-entrypoint-initdb.d/1-create_all_db.sql
     deploy:
       placement:
         constraints:
           - node.labels.${STACK_NAME?Variable not set}.app-db-data == true
-    volumes:
-      - ./scripts/initdb/create_db.sql:/docker-entrypoint-initdb.d/1-create_all_db.sql 
-      - postgres-db:/var/lib/postgresql/data
 
   redis:
     image: redis:6.0.9-alpine