Fix indentation of YAML files

Also removed obsolete exposed port definitions of Zenoh Router.
eclipse-sdv-blueprints · Oct 18, 2024 · 0eda8db · 0eda8db
1 parent 92c2b4f
commit 0eda8db
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 65 deletions.
diff --git a/fms-blueprint-compose-hono.yaml b/fms-blueprint-compose-hono.yaml
@@ -2,7 +2,7 @@
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -26,34 +26,34 @@ services:
       dockerfile: "Dockerfile.fms-consumer"
     container_name: "fms-consumer"
     cap_drop:
-    - CAP_MKNOD
-    - CAP_NET_RAW
-    - CAP_AUDIT_WRITE
+      - CAP_MKNOD
+      - CAP_NET_RAW
+      - CAP_AUDIT_WRITE
     networks:
-    - "fms-backend"
+      - "fms-backend"
     depends_on:
       influxdb:
         condition: service_healthy
     env_file:
-    - "./influxdb/fms-demo.env"
+      - "./influxdb/fms-demo.env"
     environment:
       INFLUXDB_TOKEN_FILE: "/tmp/fms-demo.token"
       KAFKA_PROPERTIES_FILE: "/app/config/${FMS_CONSUMER_KAFKA_PROPERTIES_FILE:-kafka.properties}"
       KAFKA_TOPIC_NAME: "${FMS_CONSUMER_KAFKA_TOPIC_NAME}"
       RUST_LOG: "${FMS_CONSUMER_LOG_CONFIG:-info,fms_consumer=debug,influx_client=debug}"
     volumes:
-    - type: "volume"
-      source: "influxdb-auth"
-      target: "/tmp"
-      read_only: true
-    - type: "bind"
-      source: "${FMS_CONSUMER_CONFIG_FOLDER}"
-      target: "/app/config"
+      - type: "volume"
+        source: "influxdb-auth"
+        target: "/tmp"
+        read_only: true
+      - type: "bind"
+        source: "${FMS_CONSUMER_CONFIG_FOLDER}"
+        target: "/app/config"
   fms-forwarder:
     command: "hono"
     env_file:
-    - "${FMS_FORWARDER_MQTT_ENV_FILE}"
+      - "${FMS_FORWARDER_MQTT_ENV_FILE}"
     volumes:
-    - type: "bind"
-      source: "${FMS_FORWARDER_CONFIG_FOLDER}"
-      target: "/app/config"
+      - type: "bind"
+        source: "${FMS_FORWARDER_CONFIG_FOLDER}"
+        target: "/app/config"
diff --git a/fms-blueprint-compose.yaml b/fms-blueprint-compose.yaml
@@ -2,7 +2,7 @@
 #
 # See the NOTICE file(s) distributed with this work for additional
 # information regarding copyright ownership.
-# 
+#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -51,9 +51,9 @@ services:
       timeout: 3s
       start_period: 5s
     cap_drop: &default-drops
-    - CAP_MKNOD
-    - CAP_NET_RAW
-    - CAP_AUDIT_WRITE
+      - CAP_MKNOD
+      - CAP_NET_RAW
+      - CAP_AUDIT_WRITE
     command: influxd
     env_file: "./influxdb/fms-demo.env"
     environment:
@@ -63,47 +63,47 @@ services:
       DOCKER_INFLUXDB_INIT_RETENTION: "1w"
       DOCKER_INFLUXDB_INIT_ADMIN_TOKEN: "fms-backend-admin-token"
     networks:
-    - "fms-backend"
+      - "fms-backend"
     ports:
-    - "0.0.0.0:8086:8086"
+      - "0.0.0.0:8086:8086"
     configs:
-    - source: "influxdb_init.sh"
-      target: "/docker-entrypoint-initdb.d/influxdb_init.sh"
+      - source: "influxdb_init.sh"
+        target: "/docker-entrypoint-initdb.d/influxdb_init.sh"
     volumes:
-    - type: "volume"
-      source: "influxdb-data"
-      target: "/var/lib/influxdb2"
-    - type: "volume"
-      source: "influxdb-config"
-      target: "/etc/influxdb2"
-    - type: "volume"
-      source: "influxdb-auth"
-      target: "/tmp/out"
-    - type: "volume"
-      source: "grafana-datasources"
-      target: "/tmp/influxdb-datasources"
+      - type: "volume"
+        source: "influxdb-data"
+        target: "/var/lib/influxdb2"
+      - type: "volume"
+        source: "influxdb-config"
+        target: "/etc/influxdb2"
+      - type: "volume"
+        source: "influxdb-auth"
+        target: "/tmp/out"
+      - type: "volume"
+        source: "grafana-datasources"
+        target: "/tmp/influxdb-datasources"
   grafana:
     image: "docker.io/grafana/grafana:9.5.14"
     container_name: "grafana"
     cap_drop: *default-drops
     ports:
-    - "127.0.0.1:3000:3000"
+      - "127.0.0.1:3000:3000"
     networks:
-    - "fms-backend"
+      - "fms-backend"
     depends_on:
       influxdb:
         condition: service_healthy
     configs:
-    - source: "grafana_dashboards_from_fs.yaml"
-      target: "/etc/grafana/provisioning/dashboards/grafana_dashboards_from_fs.yaml"
-    - source: "grafana_fms_dashboard.json"
-      target: "/etc/dashboards/grafana_fms_dashboard.json"
-      mode: 0644
+      - source: "grafana_dashboards_from_fs.yaml"
+        target: "/etc/grafana/provisioning/dashboards/grafana_dashboards_from_fs.yaml"
+      - source: "grafana_fms_dashboard.json"
+        target: "/etc/dashboards/grafana_fms_dashboard.json"
+        mode: 0644
     volumes:
-    - type: "volume"
-      source: "grafana-datasources"
-      target: "/etc/grafana/provisioning/datasources"
-      read_only: true
+      - type: "volume"
+        source: "grafana-datasources"
+        target: "/etc/grafana/provisioning/datasources"
+        read_only: true
   fms-server:
     image: "ghcr.io/eclipse-sdv-blueprints/fleet-management/fms-server:main"
     build:
@@ -112,9 +112,9 @@ services:
     container_name: "fms-server"
     cap_drop: *default-drops
     networks:
-    - "fms-backend"
+      - "fms-backend"
     ports:
-    - "127.0.0.1:8081:8081"
+      - "127.0.0.1:8081:8081"
     depends_on:
       influxdb:
         condition: service_healthy
@@ -123,20 +123,20 @@ services:
       INFLUXDB_TOKEN_FILE: "/tmp/fms-demo.token"
       RUST_LOG: "info"
     volumes:
-    - type: "volume"
-      source: "influxdb-auth"
-      target: "/tmp"
-      read_only: true
+      - type: "volume"
+        source: "influxdb-auth"
+        target: "/tmp"
+        read_only: true
   databroker:
     image: "ghcr.io/eclipse/kuksa.val/databroker:0.4.1"
     container_name: "databroker"
     cap_drop: *default-drops
     networks:
-    - "fms-vehicle"
+      - "fms-vehicle"
     ports:
-    - "127.0.0.1:55555:55556"
+      - "127.0.0.1:55555:55556"
     configs:
-    - "vss_overlay.json"
+      - "vss_overlay.json"
     environment:
       KUKSA_DATA_BROKER_ADDR: "0.0.0.0"
       KUKSA_DATA_BROKER_PORT: "55556"
@@ -152,8 +152,8 @@ services:
     container_name: "fms-forwarder"
     cap_drop: *default-drops
     networks:
-    - "fms-backend"
-    - "fms-vehicle"
+      - "fms-backend"
+      - "fms-vehicle"
     depends_on:
       influxdb:
         condition: service_healthy
@@ -167,21 +167,21 @@ services:
       RUST_LOG: "${FMS_FORWARDER_LOG_CONFIG:-info,fms_forwarder=info,influx_client=info}"
       TRUST_STORE_PATH: "${FMS_FORWARDER_TRUST_STORE_PATH:-/etc/ssl/certs/ca-certificates.crt}"
     volumes:
-    - type: "volume"
-      source: "influxdb-auth"
-      target: "/etc/forwarder"
-      read_only: true
+      - type: "volume"
+        source: "influxdb-auth"
+        target: "/etc/forwarder"
+        read_only: true
   csv-provider:
     image: "ghcr.io/eclipse/kuksa.val.feeders/csv-provider:main"
     container_name: "csv-provider"
     cap_drop: *default-drops
     networks:
-    - "fms-vehicle"
+      - "fms-vehicle"
     depends_on:
       databroker:
         condition: service_started
     volumes:
-    - "./csv-provider/signalsFmsRecording.csv:/dist/signals.csv"
+      - "./csv-provider/signalsFmsRecording.csv:/dist/signals.csv"
     environment:
       PROVIDER_INFINITE: 1
       PROVIDER_LOG_LEVEL: "INFO"