From 9305cb9f1cebd7b4a965af0d22d310747924da2f Mon Sep 17 00:00:00 2001 From: MarioIvancik Date: Fri, 8 Nov 2024 12:09:20 +0100 Subject: [PATCH 1/3] updated services to latest versions --- configuration/external-server/config.json | 2 +- configuration/http-api/config.json | 3 +- configuration/integration-layer/config.json | 2 +- configuration/management-api/config.json | 2 +- configuration/module-gateway/config.json | 13 +++++-- configuration/virtual-plc/config.json | 13 +++++-- .../virtual-vehicle-utility/config.json | 30 ++++++++++------ docker-compose.yml | 36 +++++++++---------- 8 files changed, 60 insertions(+), 41 deletions(-) diff --git a/configuration/external-server/config.json b/configuration/external-server/config.json index 3375ac9..dc7421a 100644 --- a/configuration/external-server/config.json +++ b/configuration/external-server/config.json @@ -1,7 +1,7 @@ { "logging": { "console": { - "level": "debug", + "level": "info", "use": true }, "file": { diff --git a/configuration/http-api/config.json b/configuration/http-api/config.json index 76c2842..cf7b8af 100644 --- a/configuration/http-api/config.json +++ b/configuration/http-api/config.json @@ -1,7 +1,7 @@ { "logging": { "console": { - "level": "debug", + "level": "info", "use": true }, "file": { @@ -22,7 +22,6 @@ "timing_in_seconds": { "retention_period": 3600, "cleanup_period": 1 - } } }, diff --git a/configuration/integration-layer/config.json b/configuration/integration-layer/config.json index 1af720e..9938335 100644 --- a/configuration/integration-layer/config.json +++ b/configuration/integration-layer/config.json @@ -1,7 +1,7 @@ { "logging": { "console": { - "level": "debug", + "level": "info", "use": true }, "file": { diff --git a/configuration/management-api/config.json b/configuration/management-api/config.json index 7cea4e8..b922923 100644 --- a/configuration/management-api/config.json +++ b/configuration/management-api/config.json @@ -1,7 +1,7 @@ { "logging": { "console": { - "level": "debug", + "level": "info", "use": true }, "file": { diff --git a/configuration/module-gateway/config.json b/configuration/module-gateway/config.json index 77211de..43b4fb4 100644 --- a/configuration/module-gateway/config.json +++ b/configuration/module-gateway/config.json @@ -1,7 +1,14 @@ { - "general-settings": { - "log-path": "/home/bringauto/log", - "verbose": true + "logging": { + "console": { + "level": "info", + "use": true + }, + "file": { + "level": "debug", + "use": true, + "path": "/home/bringauto/log/" + } }, "internal-server-settings": { "port": 1636 diff --git a/configuration/virtual-plc/config.json b/configuration/virtual-plc/config.json index ea4e0a0..6d97110 100644 --- a/configuration/virtual-plc/config.json +++ b/configuration/virtual-plc/config.json @@ -1,7 +1,16 @@ { + "logging": { + "console": { + "level": "error", + "use": true + }, + "file": { + "level": "debug", + "use": true, + "path": "/home/bringauto/virtual-plc/log/" + } + }, "general-settings": { - "log-path": "/home/bringauto/virtual-plc/log", - "verbose": false, "logic-type": "mirror", "reconnection-attempts": 3 }, diff --git a/configuration/virtual-vehicle-utility/config.json b/configuration/virtual-vehicle-utility/config.json index 090188b..4d93e34 100644 --- a/configuration/virtual-vehicle-utility/config.json +++ b/configuration/virtual-vehicle-utility/config.json @@ -1,13 +1,22 @@ { + "logging": { + "console": { + "level": "info", + "use": true + }, + "file": { + "level": "debug", + "use": true, + "path": "/virtual-vehicle-utility/log/" + } + }, "general-settings": { - "log-path": "/virtual-vehicle-utility/log", - "verbose": true, "period-ms": 1000 }, "vehicle-settings": { - "vehicle-provider": "simulation", - "gps-settings": { - "gps-provider": "rutx09", + "vehicle-provider-type": "simulation", + "provider-gps-settings": { + "gps-provider-type": "rutx09", "rutx09-settings" : { "rutx-ip": "127.0.0.2", "rutx-port": 502, @@ -17,9 +26,10 @@ "map": "/virtual-vehicle-utility/config/map.osm", "default-route": "" }, - "stop-radius-m": 8 + "stop-radius-m": 8, + "in-stop-delay-s": 10 }, - "simulation-settings": { + "provider-simulation-settings": { "speed-override": true, "speed-override-mps": 5, "wait-at-stop-s": 10, @@ -28,16 +38,14 @@ } }, "fleet-settings": { - "fleet-provider": "internal-protocol", - "internal-protocol-settings": { + "fleet-provider-type": "internal-protocol", + "provider-internal-protocol-settings": { "module-gateway-ip":"module-gateway", "module-gateway-port": 1636, "device-role": "autonomy", "device-priority": 1, "reconnect-period-s": 20, "device-name": "virtual_vehicle" - }, - "empty":{ } } } diff --git a/docker-compose.yml b/docker-compose.yml index 8d8e161..24cef41 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: virtual-vehicle: - image: bringauto/virtual-vehicle:v3.2.1 + image: bringauto/virtual-vehicle:v3.3.0 profiles: ["all", "without-module-gateway", "without-external-server", "core", "virtual-vehicle", "without-fleet-management"] volumes: - ./docker_volumes/virtual-vehicle-utility:/virtual-vehicle-utility/log @@ -15,7 +15,7 @@ services: condition: service_completed_successfully virtual-plc: - image: bringauto/virtual-plc:v1.0.0 + image: bringauto/virtual-plc:v1.1.0 profiles: ["all", "without-module-gateway", "without-external-server", "core", "virtual-plc", "without-fleet-management"] volumes: - ./docker_volumes/virtual-plc:/home/bringauto/virtual-plc/log @@ -30,7 +30,7 @@ services: condition: service_completed_successfully module-gateway: - image: bringauto/module-gateway:v1.2.1 + image: bringauto/module-gateway:v1.3.0 profiles: ["all", "without-devices", "without-external-server", "module-gateway", "core", "without-fleet-management"] volumes: - ./docker_volumes/module-gateway:/home/bringauto/log/ @@ -38,8 +38,7 @@ services: ports: - 1636:1636 entrypoint: ["/home/bringauto/module-gateway/bin/module-gateway-app", - "--config-path=/home/bringauto/config/config.json", - "--verbose"] + "--config-path=/home/bringauto/config/config.json"] restart: "no" networks: - bring-emulator @@ -78,7 +77,7 @@ services: condition: service_completed_successfully http-api: - image: bringauto/fleet-protocol-http-api:v2.8.0 + image: bringauto/fleet-protocol-http-api:v2.8.1 profiles: ["all", "without-devices", "without-module-gateway", "without-external-server", "http-api", "without-fleet-management", "for-virtual-fleet", "cloud"] ports: - 8080:8080 @@ -110,7 +109,7 @@ services: condition: service_completed_successfully management-api: - image: bringauto/fleet-management-http-api:v3.3.0 + image: bringauto/fleet-management-http-api:v3.3.1 profiles: ["all", "without-devices", "without-module-gateway", "without-external-server", "management-api", "without-fleet-management", "for-virtual-fleet", "cloud"] ports: - 8081:8081 @@ -182,22 +181,19 @@ services: condition: service_completed_successfully initialize-log-folders: - image: ubuntu:24.04 + image: bringauto/directory-permission-setter:latest restart: "no" volumes: - ./docker_volumes:/docker_volumes - entrypoint: - [ - "/usr/bin/chown", - "-R", - "5000:5000", - "/docker_volumes/module-gateway", - "/docker_volumes/external-server", - "/docker_volumes/virtual-vehicle-utility", - "/docker_volumes/integration-layer", - "/docker_volumes/http-api", - "/docker_volumes/management-api" - ] + environment: + DIRECTORIES_TO_SET: >- + /docker_volumes/module-gateway + /docker_volumes/external-server + /docker_volumes/virtual-vehicle-utility + /docker_volumes/virtual-plc + /docker_volumes/integration-layer + /docker_volumes/http-api + /docker_volumes/management-api networks: bring-emulator: From 1c77d9b91e3ab1a42f8c90f2f2c5691f476c11fc Mon Sep 17 00:00:00 2001 From: MarioIvancik Date: Fri, 20 Dec 2024 16:02:59 +0100 Subject: [PATCH 2/3] updated components --- configuration/management-api/config.json | 1 + docker-compose.yml | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configuration/management-api/config.json b/configuration/management-api/config.json index b922923..44a6b11 100644 --- a/configuration/management-api/config.json +++ b/configuration/management-api/config.json @@ -31,6 +31,7 @@ }, "maximum_number_of_table_rows": { "car_states": 100, + "car_action_states": 100, "order_states": 100 } }, diff --git a/docker-compose.yml b/docker-compose.yml index 24cef41..bf5a847 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -63,7 +63,7 @@ services: condition: service_completed_successfully external-server: - image: bringauto/external-server:v2.1.0 + image: bringauto/external-server:v2.1.1 profiles: ["all", "without-devices", "without-module-gateway", "without-fleet-management", "external_server", "cloud"] volumes: - ./docker_volumes/external-server/:/home/bringauto/log/ @@ -77,7 +77,7 @@ services: condition: service_completed_successfully http-api: - image: bringauto/fleet-protocol-http-api:v2.8.1 + image: bringauto/fleet-protocol-http-api:v2.8.3 profiles: ["all", "without-devices", "without-module-gateway", "without-external-server", "http-api", "without-fleet-management", "for-virtual-fleet", "cloud"] ports: - 8080:8080 @@ -95,7 +95,7 @@ services: command: ["config/config.json", "--location", "postgresql-database"] integration-layer: - image: bringauto/fleet-management-integration-layer:v2.2.0 + image: bringauto/fleet-management-integration-layer:v2.3.1 profiles: ["all", "without-devices", "without-module-gateway", "without-external-server", "without-fleet-management", "for-virtual-fleet", "cloud"] restart: "no" networks: @@ -109,7 +109,7 @@ services: condition: service_completed_successfully management-api: - image: bringauto/fleet-management-http-api:v3.3.1 + image: bringauto/fleet-management-http-api:v3.4.4 profiles: ["all", "without-devices", "without-module-gateway", "without-external-server", "management-api", "without-fleet-management", "for-virtual-fleet", "cloud"] ports: - 8081:8081 From 86bbe9d7912beca6e89b8446ab09106b4cd33eb4 Mon Sep 17 00:00:00 2001 From: MarioIvancik Date: Thu, 9 Jan 2025 14:32:59 +0100 Subject: [PATCH 3/3] update docker image tags --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index bf5a847..c683a24 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,7 @@ services: condition: service_completed_successfully module-gateway: - image: bringauto/module-gateway:v1.3.0 + image: bringauto/module-gateway:v1.3.1 profiles: ["all", "without-devices", "without-external-server", "module-gateway", "core", "without-fleet-management"] volumes: - ./docker_volumes/module-gateway:/home/bringauto/log/ @@ -63,7 +63,7 @@ services: condition: service_completed_successfully external-server: - image: bringauto/external-server:v2.1.1 + image: bringauto/external-server:v2.1.3 profiles: ["all", "without-devices", "without-module-gateway", "without-fleet-management", "external_server", "cloud"] volumes: - ./docker_volumes/external-server/:/home/bringauto/log/ @@ -95,7 +95,7 @@ services: command: ["config/config.json", "--location", "postgresql-database"] integration-layer: - image: bringauto/fleet-management-integration-layer:v2.3.1 + image: bringauto/fleet-management-integration-layer:v2.3.2 profiles: ["all", "without-devices", "without-module-gateway", "without-external-server", "without-fleet-management", "for-virtual-fleet", "cloud"] restart: "no" networks: