Refactored .env for some services

.env

@@ -1,5 +1,15 @@
 # .env is a work in progress, you might see repeated variables. We will clean this up in later versions
 
+# Here is a service by service breakdown of all the environment variables.
+
+### uci-api-db
+UCI_API_POSTGRES_PASSWORD=yoursupersecret
+UCI_API_POSTGRES_USER=postgresql
+UCI_API_POSTGRES_DB=comms
+
+### uci-api-db-gql
+HASURA_GRAPHQL_ADMIN_SECRET=4GeEB2JCU5rBdLvQ4AbeqqrPGu7kk9SZDhJUZm7A
+
 ### For Fusionauth Service
 FUSIONAUTH_POSTGRES_USER=postgres
 FUSIONAUTH_POSTGRES_DBNAME=postgres
@@ -28,18 +38,6 @@ ODK_POSTGRES_DB=aggregate
 
 ###  For UCI APIs
 
-# Postgres
-PSQL_DB_URL=postgres://postgresql:yoursupersecret@uci-api-db:5432/comms
-PSQL_DB_URL_DEV=postgres://postgresql:yoursupersecret@uci-api-db:5432/comms
-UCI_API_POSTGRES_PASSWORD=yoursupersecret
-UCI_API_POSTGRES_USER=postgresql
-UCI_API_POSTGRES_DB=comms
-DATABASE_DEBUG=true
-POSTGRES_HOST=uci-api-db
-POSTGRES_USER=postgresql
-POSTGRES_PASSWORD=yoursupersecret
-POSTGRES_DB=comms
-
 # Redis
 REDIS_HOST=scheduler-db
 REDIS_PORT=6379
@@ -68,7 +66,10 @@ FA_ANONYMOUS_BOT_ID=1536f2d5-813f-43db-a40d-c64803d3648e
 HASURA_GRAPHQL_DATABASE_URL=postgres://postgresql:yoursupersecret@uci-api-db:5432/comms
 HASURA_GRAPHQL_ENABLE_CONSOLE=true
 HASURA_GRAPHQL_ENABLED_LOG_TYPES=startup, http-log, webhook-log, websocket-log, query-log
-HASURA_GRAPHQL_ADMIN_SECRET=4GeEB2JCU5rBdLvQ4AbeqqrPGu7kk9SZDhJUZm7A
+
+
+# Hasura formsdb
+FORMSDB_HASURA_GRAPHQL_ADMIN_SECRET=4GeEB2JCU5rBdLvQ4AbeqqrPGu7kk9SZDhJUZm7A
 
 # Hasura formsdb
 FORMSDB_HASURA_GRAPHQL_ADMIN_SECRET=4GeEB2JCU5rBdLvQ4AbeqqrPGu7kk9SZDhJUZm7A

docker-compose.yml

@@ -7,26 +7,22 @@ services:
       context: ./uci-apis/v2/uci
     image: federation-service
     restart: always
-    env_file: .env
-
     ports:
       - 9999:9999
 
   uci-api-db:
     image: postgres:12
-    env_file: .env
     restart: always
     environment:
       - POSTGRES_PASSWORD=${UCI_API_POSTGRES_PASSWORD}
       - POSTGRES_USER=${UCI_API_POSTGRES_USER}
       - POSTGRES_DB=${UCI_API_POSTGRES_DB}
     volumes:
-      - pgdata-uci-api-db:/var/lib/postgresql/data
+      - ./data/pgdata-uci-api-db:/var/lib/postgresql/data
 
   uci-api-db-gql:
     image: hasura/graphql-engine:v2.0.0-alpha.1
     restart: always
-    env_file: .env
     ports:
       - "15003:8080"
     depends_on:
@@ -36,12 +32,11 @@ services:
 
   uci-api-scheduler-db:
     image: redis:latest
-    env_file: .env
     restart: always
     command: ["redis-server", "--appendonly", "yes"]
     hostname: redis
     volumes:
-      - ./uci-api-scheduler-db:/data
+      - ./data/uci-api-scheduler-db:/data
       - ./redis.conf:/usr/local/etc/redis/redis.conf
 
 # UCI PWA Adapter
@@ -97,7 +92,7 @@ services:
     command: ['redis-server', '--appendonly', 'yes']
     hostname: redis
     volumes:
-      - ./redis-data:/data
+      - ./data/redis-data:/data
       - ./redis.conf:/usr/local/etc/redis/redis.conf
 
 # Kafka
@@ -119,10 +114,10 @@ services:
       KAFKA_OPTS: "-Djava.security.auth.login.config=/etc/kafka/kafka_server_jaas.conf"
       KAFKA_LOG_DIRS: ./data00/kafka-logs
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
       - ./etc/kafka_server_jaas.conf:/etc/kafka/kafka_server_jaas.conf
-      - ./data00/kafka:/kafka
-      - ./kafka-data:/var/lib/kafka:Z
+      - ./var/run/docker.sock:/var/run/docker.sock
+      - ./data/data00/kafka:/kafka
+      - ./data/kafka-data:/var/lib/kafka:Z
     links:
       - zookeeper
 
@@ -214,7 +209,7 @@ services:
       - HEAP_NEWSIZE=1000M
       - CASSANDRA_RPC_ADDRESS=0.0.0.0
     volumes:
-      - ./out/cd-new:/var/lib/cassandra
+      - ./data/cd-data:/var/lib/cassandra
     healthcheck:
       test:
         [
@@ -234,7 +229,7 @@ services:
     ports:
       - "127.0.0.1:6389:6379"
     volumes:
-      - redis-data:/data   
+      - ./data/redis-data:/data   
 
   formsdb:
     restart: always
@@ -244,7 +239,7 @@ services:
       POSTGRES_USER: ${FORMS_DB_USERNAME}
       POSTGRES_DB: ${FORMS_DB_NAME}
     volumes:
-      - db-data-formsdb:/var/lib/postgresql/data
+      - ./data/formsdb-data:/var/lib/postgresql/data
 
   graphql-formsdb:
     restart: always
@@ -269,7 +264,7 @@ services:
       - POSTGRES_DB=${ODK_POSTGRES_DB}
     volumes:
       - ./odk-aggregate/odk/initdb:/docker-entrypoint-initdb.d
-      - ./pgdata-odk:/var/lib/postgresql/data
+      - ./data/pgdata-odk:/var/lib/postgresql/data
 
   wait_for_db:
     restart: always
@@ -311,7 +306,7 @@ services:
     #     soft: -1
     #     hard: -1
     volumes:
-      - fa-es-data:/usr/share/elasticsearch/data
+      - ./data/fa-es-data:/usr/share/elasticsearch/data
 
   fusionauth:
     image: fusionauth/fusionauth-app:latest
@@ -334,7 +329,7 @@ services:
     ports:
       - 9011:9011
     volumes:
-      - fa-config:/usr/local/fusionauth/config
+      - ./fa-config:/usr/local/fusionauth/config
       - ./kickstart:/usr/local/fusionauth/kickstart
 
   fa-db:
@@ -344,29 +339,18 @@ services:
       - POSTGRES_USER=${FUSIONAUTH_POSTGRES_USER}
       - POSTGRES_PASSWORD=${FUSIONAUTH_POSTGRES_PASSWORD}
     volumes:
-      - ./pgdata-fa-db:/var/lib/postgresql/data
+      - ./data/pgdata-fa-db:/var/lib/postgresql/data
 
   vault:
     image: vault:1.10.3
     restart: always
     volumes:
       - ./vault/vault.json:/vault/config/vault.json
-      - vault-data:/vault/file
+      - ./data/vault-data:/vault/file
     environment:
       - VAULT_ADDR=http://0.0.0.0:8200
       - VAULT_API_ADDR=http://0.0.0.0:8200
       - VAULT_ADDRESS=http://0.0.0.0:8200
     cap_add:
       - IPC_LOCK
-    command: vault server -config=/vault/config/vault.json
-
-volumes:
-  db-data-formsdb:
-  db-data-messagedb:
-  kafka-data:
-  redis-data:
-  license.json:
-  fa-es-data:
-  fa-config:
-  pgdata-uci-api-db:
-  vault-data:
+    command: vault server -config=/vault/config/vault.json