adding environment variables

Kitware · Feb 19, 2024 · 95e0a6e · 95e0a6e
1 parent dd9abcd
commit 95e0a6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/dev/.env.docker-compose b/dev/.env.docker-compose
@@ -1,4 +1,6 @@
 DJANGO_CONFIGURATION=DevelopmentConfiguration
+DJANGO_DATABASE_NAME=django
+DJANGO_DATABASE_PASSWORD=postgres
 DJANGO_DATABASE_URL=postgres://postgres:postgres@postgres:5432/django
 DJANGO_CELERY_BROKER_URL=amqp://rabbitmq:5672/
 DJANGO_MINIO_STORAGE_ENDPOINT=minio:9000

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,8 +3,8 @@ services:
   postgres:
     image: postgis/postgis:latest
     environment:
-      POSTGRES_DB: django
-      POSTGRES_PASSWORD: postgres
+      - POSTGRES_DB=${DJANGO_DATABASE_NAME:-django}
+      - POSTGRES_PASSWORD=${DJANGO_MINIO_STORAGE_SECRET_KEY:-postgres}
     ports:
       - ${DOCKER_POSTGRES_PORT-5432}:5432
     volumes:
@@ -24,8 +24,8 @@ services:
     tty: true
     command: ["server", "/data", "--console-address", ":${DOCKER_MINIO_CONSOLE_PORT-9001}"]
     environment:
-      MINIO_ROOT_USER: minioAccessKey
-      MINIO_ROOT_PASSWORD: minioSecretKey
+      - MINIO_ROOT_USER=${DJANGO_MINIO_STORAGE_ACCESS_KEY:-minioAccessKey}
+      - MINIO_ROOT_PASSWORD=${DJANGO_DATABASE_PASSWORD:-minioSecretKey}
     ports:
       - ${DOCKER_MINIO_PORT-9000}:9000
       - ${DOCKER_MINIO_CONSOLE_PORT-9001}:9001