Update for more reliable compose
Build Docs / build (push) Failing after 49s
Details
Build Docs / build (push) Failing after 49s
Details
This commit is contained in:
parent
e15b036720
commit
f035a09321
|
@ -70,7 +70,7 @@ async def main():
|
||||||
).bind_value(newRobotParams, 'sysid')
|
).bind_value(newRobotParams, 'sysid')
|
||||||
default_robot_compose = (
|
default_robot_compose = (
|
||||||
"/robots/spiri-mu/core/docker-compose.yaml\n"
|
"/robots/spiri-mu/core/docker-compose.yaml\n"
|
||||||
"#/robots/spiri-mu/virtual_camera/docker-compose.yaml"
|
"#/robots/spiri-mu/virtual_camera/docker-compose.yaml --build"
|
||||||
)
|
)
|
||||||
ui.label("Compose files").classes("text-xl")
|
ui.label("Compose files").classes("text-xl")
|
||||||
ui.codemirror(value=default_robot_compose, language="bash", theme="basicDark").bind_value(newRobotParams, 'compose_files')
|
ui.codemirror(value=default_robot_compose, language="bash", theme="basicDark").bind_value(newRobotParams, 'compose_files')
|
||||||
|
|
|
@ -96,6 +96,7 @@ class Robot:
|
||||||
container_status = {}
|
container_status = {}
|
||||||
with element:
|
with element:
|
||||||
while True:
|
while True:
|
||||||
|
with logger.catch():
|
||||||
# Poll for data that changes
|
# Poll for data that changes
|
||||||
for container in self.containers():
|
for container in self.containers():
|
||||||
try:
|
try:
|
||||||
|
@ -221,6 +222,11 @@ class Robot:
|
||||||
self.spawn_gz_model()
|
self.spawn_gz_model()
|
||||||
logger.info("Starting drone stack, this may take some time")
|
logger.info("Starting drone stack, this may take some time")
|
||||||
for compose_file in self.compose_files:
|
for compose_file in self.compose_files:
|
||||||
|
arguments = compose_file.split(" ")
|
||||||
|
arguments = [arg.strip() for arg in arguments]
|
||||||
|
compose_file = arguments[0]
|
||||||
|
arguments = arguments[1:]
|
||||||
|
|
||||||
if not isinstance(compose_file, Path):
|
if not isinstance(compose_file, Path):
|
||||||
compose_file = Path(compose_file)
|
compose_file = Path(compose_file)
|
||||||
if not compose_file.exists():
|
if not compose_file.exists():
|
||||||
|
@ -236,15 +242,17 @@ class Robot:
|
||||||
"-f",
|
"-f",
|
||||||
compose_file.as_posix(),
|
compose_file.as_posix(),
|
||||||
"up",
|
"up",
|
||||||
|
*arguments,
|
||||||
]
|
]
|
||||||
command = " ".join(args)
|
command = " ".join(args)
|
||||||
|
|
||||||
logger.info(f"Starting drone stack with command: {command}")
|
logger.info(f"Starting drone stack with command: {command}")
|
||||||
docker_stack = subprocess.Popen(
|
docker_stack = subprocess.Popen(
|
||||||
args,
|
args,
|
||||||
stdout=subprocess.PIPE,
|
# stdout=subprocess.PIPE,
|
||||||
stderr=subprocess.PIPE,
|
# stderr=subprocess.PIPE,
|
||||||
)
|
)
|
||||||
|
logger.info(f"Started drone stack with PID: {docker_stack.pid}")
|
||||||
|
|
||||||
@logger.catch
|
@logger.catch
|
||||||
def spawn_gz_model(self):
|
def spawn_gz_model(self):
|
||||||
|
|
|
@ -4,7 +4,10 @@ services:
|
||||||
ipc: host
|
ipc: host
|
||||||
network_mode: host
|
network_mode: host
|
||||||
# image: git.spirirobotics.com/spiri/services-ros2-mavros:main
|
# image: git.spirirobotics.com/spiri/services-ros2-mavros:main
|
||||||
|
#Build the iamge, give it a name, don't try to pull the image
|
||||||
build: ./
|
build: ./
|
||||||
|
image: spirisdk-virtual_camera
|
||||||
|
pull_policy: never
|
||||||
environment:
|
environment:
|
||||||
- RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
|
- RMW_IMPLEMENTATION=rmw_cyclonedds_cpp
|
||||||
command: ros2 run ros_gz_image image_bridge /world/${WORLD_NAME}/model/${ROBOT_NAME}/link/pitch_link/sensor/camera/image
|
command: ros2 run ros_gz_image image_bridge /world/${WORLD_NAME}/model/${ROBOT_NAME}/link/pitch_link/sensor/camera/image
|
Loading…
Reference in New Issue