Database password from env, refactor docker-compose

Author: droserasprout

README.md

@@ -158,9 +158,13 @@ Use `docker-compose.yml` included in this repo if you prefer to run dipdup in Do
 
 ```shell
 $ docker-compose build
+$ cp secrets.env.example secrets.env
+$ # edit `secrets.env` file, change credentials
 $ docker-compose up dipdup
 ```
 
+Note that can use `DIPDUP_DATABASE_PASSWORD` environment variable to avoid storing database password in `dipdup.yml`.
+
 ### Atomicity and persistency
 
 Here's a few important things to keep in mind while running your indexer:

docker-compose.yml

@@ -1,22 +1,25 @@
 version: "3.8"
+
+x-dipdup: &x-dipdup
+  build: .
+  depends_on:
+    - db
+  volumes:
+    - ./src/dipdup_hic_et_nunc/dipdup-docker.yml:/home/dipdup/dipdup.yml
+  env_file: secrets.env
+
 services:
   dipdup:
-    build: .
+    <<: *x-dipdup
+    restart: always
     command: ["-c", "dipdup.yml", "run"]
-    depends_on:
-      - db
-    volumes:
-      - ./src/dipdup_hic_et_nunc/dipdup-docker.yml:/home/dipdup/dipdup.yml
 
   db:
     image: postgres
     restart: always
-    environment:
-      POSTGRES_USER: dipdup
-      POSTGRES_DB: dipdup
-      POSTGRES_PASSWORD: changeme
     volumes:
       - db:/var/lib/postgres/data
+    env_file: secrets.env
 
   graphql-engine:
     image: hasura/graphql-engine:v1.3.3
@@ -25,14 +28,7 @@ services:
     depends_on:
     - db
     restart: always
-    environment:
-      HASURA_GRAPHQL_DATABASE_URL: postgres://dipdup:changeme@db:5432/dipdup
-      ## enable the console served by server
-      HASURA_GRAPHQL_ENABLE_CONSOLE: "true" # set to "false" to disable console
-      ## enable debugging mode. It is recommended to disable this in production
-      HASURA_GRAPHQL_DEV_MODE: "true"
-      HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log
-      ## uncomment next line to set an admin secret
-      # HASURA_GRAPHQL_ADMIN_SECRET: myadminsecretkey
+    env_file: secrets.env
+
 volumes:
   db:

secrets.env.example

@@ -0,0 +1,11 @@
+DIPDUP_DATABASE_PASSWORD=changeme
+
+POSTGRES_USER=dipdup
+POSTGRES_DB=dipdup
+POSTGRES_PASSWORD=changeme
+
+HASURA_GRAPHQL_DATABASE_URL=postgres://dipdup:changeme@db:5432/dipdup
+HASURA_GRAPHQL_ENABLE_CONSOLE=true
+HASURA_GRAPHQL_DEV_MODE=true
+HASURA_GRAPHQL_ENABLED_LOG_TYPES=startup, http-log, webhook-log, websocket-log, query-log
+HASURA_GRAPHQL_ADMIN_SECRET=changeme

src/dipdup/config.py

@@ -11,7 +11,7 @@
 from cattrs_extras.converter import Converter
 from ruamel.yaml import YAML
 from tortoise import Model, Tortoise
-
+from os import environ as env
 from dipdup.models import IndexType, State
 
 ROLLBACK_HANDLER = 'on_rollback'
@@ -53,11 +53,16 @@ class DatabaseConfig:
     password: str = ''
     database: str
 
+    def __attrs_post_init__(self):
+        if not self.password:
+            self.password = env.get('DIPDUP_DATABASE_PASSWORD', '')
+
     @property
     def connection_string(self):
         return f'{self.driver}://{self.user}:{self.password}@{self.host}:{self.port}/{self.database}'
 
 
+
 @dataclass(kw_only=True)
 class TzktDatasourceConfig:
     """TzKT datasource config

src/dipdup_hic_et_nunc/dipdup-docker.yml

@@ -7,7 +7,6 @@ database:
   port: 5432
   user: dipdup
   database: dipdup
-  password: changeme
 
 contracts:
   HEN_objkts: