prefere ENVVARS over CLI params

docker-compose.yml

@@ -13,6 +13,7 @@ services:
     volumes:
       - "./data/minio/certs/:/tmp/certs"
 
+
   database:
     restart: "${RESTART:-on-failure}"
     # image: timescale/timescaledb:latest-pg14
@@ -54,6 +55,7 @@ services:
       timeout: 5s
       retries: 5
 
+
   object-storage:
     image: "minio/minio"
     restart: "${RESTART:-on-failure}"
@@ -121,6 +123,7 @@ services:
       timeout: 5s
       retries: 15
 
+
   worker-object-storage-setup:
     image: "registry.hzdr.de/ufz-tsm/tsm-dispatcher/dispatcher:latest"
     restart: "${RESTART:-on-failure}"
@@ -129,24 +132,19 @@ services:
         condition: "service_started"
       object-storage:
         condition: "service_healthy"
+    environment:
+      LOG_LEVEL: "${LOG_LEVEL:-INFO}"
+      TOPIC: "thing_creation"
+      MQTT_BROKER: "mqtt-broker:1883"
+      MQTT_USER: "${MQTT_USER:?Please define a mqtt user!}"
+      MQTT_PASSWORD: "${MQTT_PASSWORD:?Please define a mqtt password!}"
+      MINIO_SECURE: "${MINIO_SECURE:-False}"
+      MINIO_URL: "${MINIO_HOST:-minio:9000}"
+      MINIO_ACCESS_KEY: "${MINIO_ROOT_USER:?Please define an minio root user!}"
+      MINIO_SECURE_KEY: "${MINIO_ROOT_PASSWORD:?Please define an minio root user password!}"
     command:
-      - "--log-level"
-      - "${LOG_LEVEL:-INFO}"
-      - "--topic"
-      - "thing_creation"
-      - "--mqtt-broker"
-      - "mqtt-broker:1883"
-      - "--mqtt-user"
-      - "${MQTT_USER:?Please define a mqtt user!}"
-      - "--mqtt-password"
-      - "${MQTT_PASSWORD:?Please define a mqtt password!}"
       - "run-create-thing-on-minio-action-service"
-      - "--minio_secure"
-      - "${MINIO_SECURE:-False}"
-      - "${MINIO_HOST:-object-storage:9000}"
-      - "${MINIO_ROOT_USER:?Please define an minio root user!}"
-      - "${MINIO_ROOT_PASSWORD:?\
-      Please define an minio root user password!}"
+
 
   worker-db-setup:
     image: "registry.hzdr.de/ufz-tsm/tsm-dispatcher/dispatcher:latest"
@@ -154,22 +152,20 @@ services:
     depends_on:
       - "mqtt-broker"
       - "database"
+    environment:
+      LOG_LEVEL: "${LOG_LEVEL:-INFO}"
+      TOPIC: "thing_creation"
+      MQTT_BROKER: "mqtt-broker:1883"
+      MQTT_USER: "${MQTT_USER:?Please define a mqtt user!}"
+      MQTT_PASSWORD: "${MQTT_PASSWORD:?Please define a mqtt password!}"
+      DATABASE_URL: "postgresql://\
+        ${CREATEDB_POSTGRES_USER:?Please define an postgres user!}:\
+        ${CREATEDB_POSTGRES_PASSWORD:?Please define an postgres password!}@\
+        ${CREATEDB_POSTGRES_HOST:-database}/\
+        ${CREATEDB_POSTGRES_DATABASE:-postgres}"
     command:
-      - "--log-level"
-      - "${LOG_LEVEL:-INFO}"
-      - "--topic"
-      - "thing_creation"
-      - "--mqtt-broker"
-      - "mqtt-broker:1883"
-      - "--mqtt-user"
-      - "${MQTT_USER:?Please define a mqtt user!}"
-      - "--mqtt-password"
-      - "${MQTT_PASSWORD:?Please define a mqtt password!}"
       - "run-create-database-schema-action-service"
-      - "postgresql://${CREATEDB_POSTGRES_USER:\
-      ?Please define an postgres user!}:${CREATEDB_POSTGRES_PASSWORD:\
-      ?Please define an postgres password!}@${CREATEDB_POSTGRES_HOST:\
-      -database}/${CREATEDB_POSTGRES_DATABASE:-postgres}"
+
 
   worker-file-ingest:
     image: "registry.hzdr.de/ufz-tsm/tsm-dispatcher/dispatcher:latest"
@@ -181,24 +177,19 @@ services:
         condition: "service_healthy"
       basic-demo-scheduler:
         condition: "service_healthy"
+    environment:
+      LOG_LEVEL: "${LOG_LEVEL:-INFO}"
+      TOPIC: "object_storage_notification"
+      MQTT_BROKER: "mqtt-broker:1883"
+      MQTT_USER: "${MQTT_USER:?Please define a mqtt user!}"
+      MQTT_PASSWORD: "${MQTT_PASSWORD:?Please define a mqtt password!}"
+      MINIO_SECURE: "${MINIO_SECURE:-False}"
+      MINIO_URL: "${MINIO_HOST:-minio:9000}"
+      MINIO_ACCESS_KEY: "${MINIO_ROOT_USER:?Please define an minio root user!}"
+      MINIO_SECURE_KEY: "${MINIO_ROOT_PASSWORD:?Please define an minio root user password!}"
+      SCHEDULER_ENDPOINT_URL: "http://basic-demo-scheduler:5000/extractor/run"
     command:
-      - "--log-level"
-      - "${LOG_LEVEL:-INFO}"
-      - "--topic"
-      - "object_storage_notification"
-      - "--mqtt-broker"
-      - "mqtt-broker:1883"
-      - "--mqtt-user"
-      - "${MQTT_USER:?Please define a mqtt user!}"
-      - "--mqtt-password"
-      - "${MQTT_PASSWORD:?Please define a mqtt password!}"
       - "run-process-new-file-service"
-      - "--minio_secure"
-      - "${MINIO_SECURE:-False}"
-      - "${MINIO_HOST:-minio:9000}"
-      - "${MINIO_ROOT_USER:?Please define an minio root user!}"
-      - "${MINIO_ROOT_PASSWORD:?Please define an minio root user password!}"
-      - "http://basic-demo-scheduler:5000/extractor/run"
 
 
   worker-run-qaqc:
@@ -211,19 +202,16 @@ services:
         condition: "service_healthy"
       basic-demo-scheduler:
         condition: "service_healthy"
+    environment:
+      LOG_LEVEL: "${LOG_LEVEL:-INFO}"
+      TOPIC: "data_parsed"
+      MQTT_BROKER: "mqtt-broker:1883"
+      MQTT_USER: "${MQTT_USER:?Please define a mqtt user!}"
+      MQTT_PASSWORD: "${MQTT_PASSWORD:?Please define a mqtt password!}"
+      SCHEDULER_ENDPOINT_URL: "http://basic-demo-scheduler:5000/qaqc/run"
     command:
-      - "--log-level"
-      - "${LOG_LEVEL:-INFO}"
-      - "--topic"
-      - "data_parsed"
-      - "--mqtt-broker"
-      - "mqtt-broker:1883"
-      - "--mqtt-user"
-      - "${MQTT_USER:?Please define a mqtt user!}"
-      - "--mqtt-password"
-      - "${MQTT_PASSWORD:?Please define a mqtt password!}"
       - "run-qaqc"
-      - "http://basic-demo-scheduler:5000/qaqc/run"
+
 
   worker-mqtt-ingest:
     image: "registry.hzdr.de/ufz-tsm/tsm-dispatcher/dispatcher:latest"
@@ -231,23 +219,21 @@ services:
     depends_on:
       - mqtt-broker
       - database
+    environment:
+      LOG_LEVEL: "${LOG_LEVEL:-INFO}"
+      TOPIC: "mqtt_ingest/#"
+      MQTT_BROKER: "mqtt-broker:1883"
+      MQTT_USER: "${MQTT_INGEST_USER:?Please define a mqtt user!}"
+      MQTT_PASSWORD: "${MQTT_INGEST_PASSWORD:?Please define a mqtt password!}"
     command:
-      - --log-level
-      - ${LOG_LEVEL:-INFO}
-      - --topic
-      - mqtt_ingest/#
-      - --mqtt-broker
-      - mqtt-broker:1883
-      - --mqtt-user
-      - ${MQTT_INGEST_USER:?Please define a mqtt user!}
-      - --mqtt-password
-      - ${MQTT_INGEST_PASSWORD:?Please define a mqtt password!}
       - parse-data
       - --target-uri
-      - "postgresql://${CREATEDB_POSTGRES_USER:\
-        ?Please define an postgres user!}:${CREATEDB_POSTGRES_PASSWORD:\
-        ?Please define an postgres password!}@${CREATEDB_POSTGRES_HOST:\
-        -database}/${CREATEDB_POSTGRES_DATABASE:-postgres}"
+      - "postgresql://\
+        ${CREATEDB_POSTGRES_USER:?Please define an postgres user!}:\
+        ${CREATEDB_POSTGRES_PASSWORD:?Please define an postgres password!}@\
+        ${CREATEDB_POSTGRES_HOST:-database}/\
+        ${CREATEDB_POSTGRES_DATABASE:-postgres}"
+
 
   worker-mqtt-user-creation:
     image: "registry.hzdr.de/ufz-tsm/tsm-dispatcher/dispatcher:latest"
@@ -255,22 +241,19 @@ services:
     depends_on:
       - mqtt-broker
       - database
+    environment:
+      LOG_LEVEL: "${LOG_LEVEL:-INFO}"
+      TOPIC: "thing_creation"
+      MQTT_BROKER: "mqtt-broker:1883"
+      MQTT_USER: "${MQTT_USER:?Please define a mqtt user!}"
+      MQTT_PASSWORD: "${MQTT_PASSWORD:?Please define a mqtt password!}"
+      DATABASE_URL: "postgresql://\
+        ${CREATEDB_POSTGRES_USER:?Please define an postgres user!}:\
+        ${CREATEDB_POSTGRES_PASSWORD:?Please define an postgres password!}@\
+        ${CREATEDB_POSTGRES_HOST:-database}/\
+        ${CREATEDB_POSTGRES_DATABASE:-postgres}"
     command:
-      - --log-level
-      - ${LOG_LEVEL:-INFO}
-      - --topic
-      - thing_creation
-      - --mqtt-broker
-      - mqtt-broker:1883
-      - --mqtt-user
-      - ${MQTT_USER:?Please define a mqtt user!}
-      - --mqtt-password
-      - ${MQTT_PASSWORD:?Please define a mqtt password!}
       - run-create-mqtt-user-action-service
-      - "postgresql://${CREATEDB_POSTGRES_USER:\
-        ?Please define an postgres user!}:${CREATEDB_POSTGRES_PASSWORD:\
-        ?Please define an postgres password!}@${CREATEDB_POSTGRES_HOST:\
-        -database}/${CREATEDB_POSTGRES_DATABASE:-postgres}"
 
 
   basic-demo-scheduler:
@@ -281,13 +264,11 @@ services:
       interval: 10s
       timeout: 2s
       retries: 5
+    environment:
+      MQTT_BROKER: "mqtt-broker:1883"
+      MQTT_USER: "${MQTT_USER:?Please define a mqtt user!}"
+      MQTT_PASSWORD: "${MQTT_PASSWORD:?Please define a mqtt password!}"
     command:
-      - "--mqtt-broker"
-      - "mqtt-broker:1883"
-      - "--mqtt-user"
-      - "${MQTT_USER:?Please define a mqtt user!}"
-      - "--mqtt-password"
-      - "${MQTT_PASSWORD:?Please define a mqtt password!}"
       - "--verbose"
 
 
@@ -356,6 +337,7 @@ services:
         max-size: "${MQTT_BROKER_LOG_SIZE:-100K}"
         max-file: "${MQTT_BROKER_FILE_COUNT:-10}"
 
+
   mqtt-cat:
     restart: "${RESTART:-on-failure}"
     image: "eclipse-mosquitto:latest"
@@ -376,6 +358,7 @@ services:
       - "#"
       - "-v"
 
+
   visualization:
     restart: "${RESTART:-on-failure}"
     image: "grafana/grafana:latest"
@@ -401,6 +384,7 @@ services:
       - "./grafana/provisioning:/etc/grafana/provisioning/"
       - "./data/grafana/:/var/lib/grafana"
 
+
   frontend:
     image: "registry.hzdr.de/ufz-tsm/tsm-frontend/tsm-frontend:latest"
     restart: "${RESTART:-on-failure}"
@@ -445,21 +429,24 @@ services:
       mqtt-broker:
         condition: service_started
 
+
   tsmdl:
     image: "registry.hzdr.de/ufz-tsm/tsm-ufz-tsmdl/tsm-ufz-tsmdl:latest"
     restart: "${RESTART:-on-failure}"
     entrypoint: "/app/start.sh"
     environment:
-      DB_URL: "postgresql://${CREATEDB_POSTGRES_USER:\
-        ?Please define an postgres user!}:${CREATEDB_POSTGRES_PASSWORD:\
-        ?Please define an postgres password!}@${CREATEDB_POSTGRES_HOST:\
-        -database}/${CREATEDB_POSTGRES_DATABASE:-postgres}"
+      DB_URL: "postgresql://\
+      ${CREATEDB_POSTGRES_USER:?Please define an postgres user!}:\
+      ${CREATEDB_POSTGRES_PASSWORD:?Please define an postgres password!}@\
+      ${CREATEDB_POSTGRES_HOST:-database}/\
+      ${CREATEDB_POSTGRES_DATABASE:-postgres}"
       WEB_CONCURRENCY: 10
       UVICORN_ARGS: "${UVICORN_ARGS:-} --root-path /tsmdl"
     depends_on:
       database:
         condition: service_healthy
 
+
   proxy:
     image: nginx
     restart: "${RESTART:-on-failure}"
@@ -470,16 +457,15 @@ services:
     volumes:
       - "frontend-statics:/home/appuser/app/static"
       - "./nginx/${PROXY_SITE_CONFIG_FILE:-tsm.dev.conf}:/etc/nginx/conf.d/default.conf:ro"
-      - "${PROXY_TLS_CERT_PATH:-/tmp/c8cf2d92\
-      -73cd-11ec-b035-54e1ad7c5c19}:/etc/ssl/public.crt:ro"
-      - "${PROXY_TLS_KEY_PATH:-/tmp/c8cf2d92\
-      -73cd-11ec-b035-54e1ad7c5c19}:/etc/ssl/private.key:ro"
+      - "${PROXY_TLS_CERT_PATH:-/tmp/c8cf2d92-73cd-11ec-b035-54e1ad7c5c19}:/etc/ssl/public.crt:ro"
+      - "${PROXY_TLS_KEY_PATH:-/tmp/c8cf2d92-73cd-11ec-b035-54e1ad7c5c19}:/etc/ssl/private.key:ro"
     depends_on:
       - "frontend"
       - "visualization"
       - "object-storage"
       - "tsmdl"
 
+
   monitoring:
     image: gcr.io/cadvisor/cadvisor:latest
     container_name: "cadvisor"
@@ -491,5 +477,6 @@ services:
     - "/sys:/sys:ro"
     - "/var/lib/docker/:/var/lib/docker:ro"
 
+
 volumes:
   frontend-statics: