Changed passwords to use docker secrets to practice best practices

.env

 # postgres
 PGUSER=postgres
-PGPASSWORD=postgres
 PGDATABASE=postgres
 PGHOST=postgres
 
@@ -17,7 +16,6 @@ QUERY_INTERVAL=1
 
 # pgadmin
 PGADMIN_DEFAULT_EMAIL=admin@abc.de
-PGADMIN_DEFAULT_PASSWORD=admin
 
 # grafana
 DS_PROMETHEUS=prometheus_src

.gitignore

@@ -2,3 +2,4 @@
 __pycache__
 .mypy_cache
 /streaming/pub/data/
+/output
\ No newline at end of file

.pgpass

+*:*:*:*:postgres
\ No newline at end of file

docker-compose.yml

@@ -18,7 +18,9 @@ services:
       - PGHOST
       - PGDATABASE
       - PGUSER
-      - PGPASSWORD
+      - PGPASSFILE=/run/secrets/postgres_pass
+    secrets:
+      - postgres_pass
     depends_on:
       mosquitto:
         condition: service_started
@@ -32,10 +34,12 @@ services:
       - PGHOST
       - PGDATABASE
       - PGUSER
-      - PGPASSWORD
+      - PGPASSFILE=/run/secrets/postgres_pass
       - QUERY_INTERVAL
     volumes:
       - query-logs:/app/log
+    secrets:
+      - postgres_pass
     depends_on:
       - sub_pg
 
@@ -55,7 +59,7 @@ services:
       - PGUSER
       - POSTGRES_USER=$PGUSER
       - POSTGRES_DB=$PGDATABASE
-      - POSTGRES_PASSWORD=$PGPASSWORD
+      - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_pass
     healthcheck:
       test: pg_isready -U postgres
       start_period: 5s
@@ -65,13 +69,15 @@ services:
       - postgres-logs:/var/log/postgresql
     configs: 
       - postgres_conf
+    secrets:
+      - postgres_pass
 
 
   pgadmin:
     image: dpage/pgadmin4
     environment:
       - PGADMIN_DEFAULT_EMAIL
-      - PGADMIN_DEFAULT_PASSWORD
+      - PGADMIN_DEFAULT_PASSWORD_FILE=/run/secrets/pgadmin_pass
     profiles:
       - experiment
       - inspect
@@ -79,6 +85,8 @@ services:
       - 80:80
     volumes:
       - postgres-admin:/var/lib/pgadmin
+    secrets:
+      - pgadmin_pass
 
   grafana:
     image: grafana/grafana-oss
@@ -106,6 +114,7 @@ services:
     
   cadvisor:
     image: gcr.io/cadvisor/cadvisor
+    privileged: true
     profiles:
       - experiment
     ports:
@@ -118,7 +127,6 @@ services:
       - /dev/disk/:/dev/disk:ro
     devices:
       - /dev/kmsg
-    privileged: true
   
   postgres_exporter:
     image: bitnami/postgres-exporter
@@ -148,3 +156,9 @@ configs:
     file: ./grafana/dashboard.yaml
   grafana_dash_src:
     file: ./grafana/9628_rev7.json
+
+secrets:
+  pgadmin_pass:
+    file: ./pgadminpass.txt
+  postgres_pass:
+    file: ./.pgpass

pgadminpass.txt

+admin
\ No newline at end of file