From acf3379fb67e5f6a8611045dbb1eee3d9285b806 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aaron=20D=C3=B6tsch?= <aaron@fsmpi.rwth-aachen.de>
Date: Thu, 3 Aug 2023 13:14:17 +0200
Subject: [PATCH] Clean up env variable management
---
.env.example | 6 ++++--
docker-compose.yml.example | 13 +++++++------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/.env.example b/.env.example
index e376bea..45274f3 100644
--- a/.env.example
+++ b/.env.example
@@ -1,2 +1,4 @@
-DATABASE_URL="postgresql://postgres:postgres@postgres:5432/postgres"
-BODY_SIZE_LIMIT=10485760 # 10MiB - increase default body size limit in order to upload large files (product images)
+DB_USERNAME="postgres"
+DB_PASSWORD="postgres"
+DB_NAME="postgres"
+BODY_SIZE_LIMIT=10485760 # 10MiB
diff --git a/docker-compose.yml.example b/docker-compose.yml.example
index 4a3b295..dc70a89 100644
--- a/docker-compose.yml.example
+++ b/docker-compose.yml.example
@@ -4,15 +4,15 @@ services:
image: postgres:11.1
restart: always
environment:
- POSTGRES_PASSWORD: postgres
- POSTGRES_USER: postgres
- POSTGRES_DB: postgres
+ POSTGRES_PASSWORD: ${DB_PASSWORD}
+ POSTGRES_USER: ${DB_USERNAME}
+ POSTGRES_DB: ${DB_NAME}
ports:
- "5432:5432"
volumes:
- ./postgres-data:/var/lib/postgresql/data
healthcheck:
- test: ["CMD-SHELL", "pg_isready -U postgres -d postgres"]
+ test: ["CMD-SHELL", "pg_isready -U ${DB_USERNAME} -d ${DB_NAME}"]
interval: 5s
timeout: 30s
retries: 5
@@ -26,8 +26,9 @@ services:
depends_on:
postgres:
condition: service_healthy
- env_file:
- - .env
+ environment:
+ BODY_SIZE_LIMIT: ${BODY_SIZE_LIMIT}
+ DATABASE_URL: postgresql://${DB_USERNAME}:${DB_PASSWORD}@postgres:5432/${DB_NAME}
volumes:
- ./article-images:/app/article-images
--
GitLab