From 9ca67f7777bc9a6aa9b8ff6994223d77c46326c7 Mon Sep 17 00:00:00 2001
From: Vincent Pochet <vincent@getlago.com>
Date: Thu, 12 May 2022 09:50:29 +0200
Subject: [PATCH] misc: Improve docker compose config (#20)

---
 docker-compose.dev.yml |  6 +++---
 docker-compose.yml     | 24 +++++++++++++-----------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index ed8aa38..a2af671 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -84,7 +84,7 @@ services:
     volumes:
       - $LAGO_PATH/api:/app
     environment:
-      - API_URL=https://api.lago.dev
+      - LAGO_API_URL=https://api.lago.dev
       - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@db:5432/${POSTGRES_DB:-lago}
       - REDIS_URL=redis://redis:6379
       - SECRET_KEY_BASE=${SECRET_KEY_BASE:-your-secret-key-base-hex-64}
@@ -112,7 +112,7 @@ services:
     volumes:
       - $LAGO_PATH/api:/app
     environment:
-      - API_URL=https://api.lago.dev
+      - LAGO_API_URL=https://api.lago.dev
       - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@db:5432/${POSTGRES_DB:-lago}
       - REDIS_URL=redis://redis:6379
       - SECRET_KEY_BASE=${SECRET_KEY_BASE:-your-secret-key-base-hex-64}
@@ -128,7 +128,7 @@ services:
     volumes:
       - $LAGO_PATH/api:/app
     environment:
-      - API_URL=https://api.lago.dev
+      - LAGO_API_URL=https://api.lago.dev
       - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@db:5432/${POSTGRES_DB:-lago}
       - REDIS_URL=redis://redis:6379
       - SECRET_KEY_BASE=${SECRET_KEY_BASE:-your-secret-key-base-hex-64}
diff --git a/docker-compose.yml b/docker-compose.yml
index 49e0ad6..0b57bec 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -37,12 +37,12 @@ services:
       - redis
     command: ["./scripts/start.sh"]
     environment:
-      - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@db:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-lago}
-      - REDIS_URL=redis://redis:${REDIS_PORT:-6379}
+      - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@${POSTGRES_HOST:-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-lago}
+      - REDIS_URL=redis://${REDIS_HOST:-redis}:${REDIS_PORT:-6379}
       - SECRET_KEY_BASE=${SECRET_KEY_BASE:-your-secret-key-base-hex-64}
       - RAILS_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
-      - LAGO_FRONT_URL"${FRONT_URL:-http://localhost}
+      - LAGO_FRONT_URL=${LAGO_FRONT_URL:-http://localhost}
     ports:
       - ${API_PORT:-3000}:3000
 
@@ -53,9 +53,9 @@ services:
     depends_on:
       - api
     environment:
-      - API_URL=${API_URL:-http://localhost:3000}
+      - API_URL=${LAGO_API_URL:-http://localhost:3000}
       - APP_ENV=${APP_ENV:-production}
-      - CODEGEN_API=${API_URL:-http://localhost:3000}
+      - CODEGEN_API=${LAGO_API_URL:-http://localhost:3000}
     ports:
       - ${FRONT_PORT:-80}:80
 
@@ -67,12 +67,14 @@ services:
       - api
     command: ["./scripts/start.worker.sh"]
     environment:
-      - API_URL=${API_URL:-http://localhost:3000}
-      - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@db:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-lago}
-      - REDIS_URL=redis://redis:${REDIS_PORT:-6379}
+      - LAGO_API_URL=${LAGO_API_URL:-http://localhost:3000}
+      - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@${POSTGRES_HOST:-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-lago}
+      - REDIS_URL=redis://${REDIS_HOST:-redis}:${REDIS_PORT:-6379}
       - SECRET_KEY_BASE=${SECRET_KEY_BASE:-your-secret-key-base-hex-64}
       - RAILS_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}
+      - RSA_PRIVATE_KEY=${LAGO_RSA_PRIVATE_KEY}
+      - RSA_PUBLIC_KEY=${LAGO_RSA_PUBLIC_KEY}
 
   api-clock:
     container_name: lago-clock
@@ -82,9 +84,9 @@ services:
       - api
     command: ["./scripts/start.clock.sh"]
     environment:
-      - API_URL=${API_URL:-http://localhost:3000}
-      - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@db:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-lago}
-      - REDIS_URL=redis://redis:${REDIS_PORT:-6379}
+      - LAGO_API_URL=${LAGO_API_URL:-http://localhost:3000}
+      - DATABASE_URL=postgresql://${POSTGRES_USER:-lago}:${POSTGRES_PASSWORD:-changeme}@${POSTGRES_HOST:-db}:${POSTGRES_PORT:-5432}/${POSTGRES_DB:-lago}
+      - REDIS_URL=redis://${REDIS_HOST:-redis}:${REDIS_PORT:-6379}
       - SECRET_KEY_BASE=${SECRET_KEY_BASE:-your-secret-key-base-hex-64}
       - RAILS_ENV=production
       - SENTRY_DSN=${SENTRY_DSN}