Merge pull request #10 from developmentseed/feature/env-per-service

Support loading env vars from common env or service-level envs

.gitignore

@@ -120,7 +120,7 @@ celerybeat.pid
 *.sage.py
 
 # Environments
-.env
+*.env
 .venv
 env/
 venv/

docker-compose.yml

@@ -1,14 +1,18 @@
-version: '3'
+version: "3"
 
 services:
-
   # change to official image when available https://github.com/radiantearth/stac-browser/pull/386
   stac-browser:
     build:
       context: dockerfiles
       dockerfile: Dockerfile.browser
     ports:
       - "${MY_DOCKER_IP:-127.0.0.1}:8085:8085"
+    env_file:
+      - path: .env
+        required: false
+      - path: .stac-browser.env
+        required: false
     depends_on:
       - stac
       - raster
@@ -38,10 +42,14 @@ services:
       # PgSTAC extensions
       # - EOAPI_STAC_EXTENSIONS=["filter", "query", "sort", "fields", "pagination", "titiler", "transaction"]  # defaults
       # - EOAPI_STAC_CORS_METHODS='GET,POST,PUT,OPTIONS'
+    env_file:
+      - path: .env
+        required: false
+      - path: .stac.env
+        required: false
     depends_on:
       - database
-    command:
-      bash -c "bash /tmp/scripts/wait-for-it.sh -t 120 -h database -p 5432 && /start.sh"
+    command: bash -c "bash /tmp/scripts/wait-for-it.sh -t 120 -h database -p 5432 && /start.sh"
     develop:
       watch:
         - action: sync+restart
@@ -87,10 +95,14 @@ services:
       - MOSAIC_CONCURRENCY=1
       - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
       - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
+    env_file:
+      - path: .env
+        required: false
+      - path: .raster.env
+        required: false
     depends_on:
       - database
-    command:
-      bash -c "bash /tmp/scripts/wait-for-it.sh -t 120 -h database -p 5432 && /start.sh"
+    command: bash -c "bash /tmp/scripts/wait-for-it.sh -t 120 -h database -p 5432 && /start.sh"
     develop:
       watch:
         - action: sync+restart
@@ -120,8 +132,12 @@ services:
       - DB_MIN_CONN_SIZE=1
       - DB_MAX_CONN_SIZE=10
       - EOAPI_VECTOR_DEBUG=TRUE
-    command:
-      bash -c "bash /tmp/scripts/wait-for-it.sh -t 120 -h database -p 5432 && /start.sh"
+    env_file:
+      - path: .env
+        required: false
+      - path: .vector.env
+        required: false
+    command: bash -c "bash /tmp/scripts/wait-for-it.sh -t 120 -h database -p 5432 && /start.sh"
     develop:
       watch:
         - action: sync+restart