Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update services #48

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update services #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion configuration/external-server/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"logging": {
"console": {
"level": "debug",
"level": "info",
"use": true
},
"file": {
Expand Down
3 changes: 1 addition & 2 deletions configuration/http-api/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"logging": {
"console": {
"level": "debug",
"level": "info",
"use": true
},
"file": {
Expand All @@ -22,7 +22,6 @@
"timing_in_seconds": {
"retention_period": 3600,
"cleanup_period": 1

}
}
},
Expand Down
2 changes: 1 addition & 1 deletion configuration/integration-layer/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"logging": {
"console": {
"level": "debug",
"level": "info",
"use": true
},
"file": {
Expand Down
2 changes: 1 addition & 1 deletion configuration/management-api/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"logging": {
"console": {
"level": "debug",
"level": "info",
MarioIvancik marked this conversation as resolved.
Show resolved Hide resolved
"use": true
},
"file": {
Expand Down
13 changes: 10 additions & 3 deletions configuration/module-gateway/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
13 changes: 11 additions & 2 deletions configuration/virtual-plc/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
{
"logging": {
"console": {
"level": "error",
"use": true
},
"file": {
"level": "debug",
"use": true,
"path": "/home/bringauto/virtual-plc/log/"
}
},
MarioIvancik marked this conversation as resolved.
Show resolved Hide resolved
"general-settings": {
"log-path": "/home/bringauto/virtual-plc/log",
"verbose": false,
"logic-type": "mirror",
"reconnection-attempts": 3
},
Expand Down
30 changes: 19 additions & 11 deletions configuration/virtual-vehicle-utility/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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,
Expand All @@ -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":{
}
}
}
Expand Down
36 changes: 16 additions & 20 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -30,16 +30,15 @@ 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/
- ./configuration/module-gateway:/home/bringauto/config/
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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
MarioIvancik marked this conversation as resolved.
Show resolved Hide resolved

networks:
bring-emulator:
Expand Down