From 7720263b9278bc0be3aa4dc84d934dd1622de713 Mon Sep 17 00:00:00 2001
From: mvvasilev <me@mvvasilev.dev>
Date: Mon, 5 Feb 2024 21:40:27 +0200
Subject: [PATCH] Clean up docker-compose

---
 .env.example       |  7 +++++++
 docker-compose.yml | 38 +++++++++++++++++++-------------------
 2 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 .env.example

diff --git a/.env.example b/.env.example
new file mode 100644
index 0000000..43610a0
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,7 @@
+POSTGRES_DB= the common database to use for the applications
+POSTGRES_USER= the postgres user
+POSTGRES_PASSWORD= the postgres password
+
+AUTHENTIK_APP_NAME= the app name ( personal-finance )
+AUTHENTIK_CLIENT_ID= authentik oauth2 client id
+AUTHENTIK_CLIENT_SECRET= authentik oauth2 client secret
diff --git a/docker-compose.yml b/docker-compose.yml
index eabefc6..3f18e8a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,10 +7,10 @@ services:
       - '8080:8080'
     environment:
       PROFILE: development
-      AUTHENTIK_CLIENT_ID: r72Ja9IIGBSoKpBsYTuJ2yBZMmJnXcWnLdW3Sgpp
-      AUTHENTIK_CLIENT_SECRET: LhhuUZlQPFPzGGEuxDhvlyBtten0LufRHx8I5ZH63031yHk7UdUboCR2WgNA4aSpmmFOz6TfkgpYHy1eh3jWeWUGpisPZxZ2PCJlSkJBtoF54MDh1iBZZSQ1gcD6r69H
-      AUTHENTIK_ISSUER_URL: https://auth.mvvasilev.dev/application/o/personal-finances/
-      AUTHENTIK_BACK_CHANNEL_LOGOUT_URL: https://auth.mvvasilev.dev/application/o/personal-finances/end-session/
+      AUTHENTIK_CLIENT_ID: ${AUTHENTIK_CLIENT_ID}
+      AUTHENTIK_CLIENT_SECRET: ${AUTHENTIK_CLIENT_ID}
+      AUTHENTIK_ISSUER_URL: https://auth.mvvasilev.dev/application/o/${AUTHENTIK_APP_NAME}/
+      AUTHENTIK_BACK_CHANNEL_LOGOUT_URL: https://auth.mvvasilev.dev/application/o/${AUTHENTIK_APP_NAME}/end-session/
       GATEWAY_URI: http://localhost:8080
       CORE_API_URI: http://core-api:8081
       STATEMENTS_API_URI: http://statements-api:8081
@@ -35,10 +35,10 @@ services:
       - '8081:8081'
     environment:
       PROFILE: 'development'
-      AUTHENTIK_ISSUER_URL: 'https://auth.mvvasilev.dev/application/o/personal-finances/'
-      DATASOURCE_URL: 'jdbc:postgresql://database:5432/finances'
-      DATASOURCE_USER: 'postgres'
-      DATASOURCE_PASSWORD: 'postgres'
+      AUTHENTIK_ISSUER_URL: 'https://auth.mvvasilev.dev/application/o/${AUTHENTIK_APP_NAME}/'
+      DATASOURCE_URL: jdbc:postgresql://database:5432/${POSTGRES_DB}
+      DATASOURCE_USER: ${POSTGRES_USER}
+      DATASOURCE_PASSWORD: ${POSTGRES_PASSWORD}
       KAFKA_SERVERS: 'kafka-broker:9092'
 
   statements-api:
@@ -47,10 +47,10 @@ services:
       - '8082:8081'
     environment:
       PROFILE: 'development'
-      AUTHENTIK_ISSUER_URL: 'https://auth.mvvasilev.dev/application/o/personal-finances/'
-      DATASOURCE_URL: 'jdbc:postgresql://database:5432/finances'
-      DATASOURCE_USER: 'postgres'
-      DATASOURCE_PASSWORD: 'postgres'
+      AUTHENTIK_ISSUER_URL: 'https://auth.mvvasilev.dev/application/o/${AUTHENTIK_APP_NAME}/'
+      DATASOURCE_URL: jdbc:postgresql://database:5432/${POSTGRES_DB}
+      DATASOURCE_USER: ${POSTGRES_USER}
+      DATASOURCE_PASSWORD: ${POSTGRES_PASSWORD}
       KAFKA_SERVERS: 'kafka-broker:9092'
 
   widgets-api:
@@ -59,10 +59,10 @@ services:
       - '8083:8081'
     environment:
       PROFILE: 'development'
-      AUTHENTIK_ISSUER_URL: 'https://auth.mvvasilev.dev/application/o/personal-finances/'
-      DATASOURCE_URL: 'jdbc:postgresql://database:5432/finances'
-      DATASOURCE_USER: 'postgres'
-      DATASOURCE_PASSWORD: 'postgres'
+      AUTHENTIK_ISSUER_URL: 'https://auth.mvvasilev.dev/application/o/${AUTHENTIK_APP_NAME}/'
+      DATASOURCE_URL: jdbc:postgresql://database:5432/${POSTGRES_DB}
+      DATASOURCE_USER: ${POSTGRES_USER}
+      DATASOURCE_PASSWORD: ${POSTGRES_PASSWORD}
 
   redis:
     image: redis/redis-stack:latest
@@ -75,9 +75,9 @@ services:
     ports:
       - '5432:5432'
     environment:
-      POSTGRES_DB: 'finances'
-      POSTGRES_USER: 'postgres'
-      POSTGRES_PASSWORD: 'postgres'
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
 
   kafka-broker:
     image: confluentinc/cp-kafka:7.5.3