Skip to content

fix: copy cmake/ directory when cloning ros2_medkit #32

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

Merged
bburda merged 2 commits into from
Feb 19, 2026
Merged

fix: copy cmake/ directory when cloning ros2_medkit #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47d2500
fix: copy cmake/ directory when cloning ros2_medkit in moveit demo
bburda Feb 19, 2026
2a80c0e
fix: abort run-demo.sh on Docker build failure
bburda Feb 19, 2026
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
1 change: 1 addition & 0 deletions demos/moveit_pick_place/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ RUN git clone --depth 1 --branch ${ROS2_MEDKIT_REF} https://github.com/selfpatch
ros2_medkit/src/ros2_medkit_fault_manager \
ros2_medkit/src/ros2_medkit_fault_reporter \
ros2_medkit/src/ros2_medkit_diagnostic_bridge . && \
mkdir -p ${COLCON_WS}/cmake && mv ros2_medkit/cmake/ROS2MedkitCompat.cmake ${COLCON_WS}/cmake/ && \
rm -rf ros2_medkit

# Copy demo package from local context
Expand Down
18 changes: 13 additions & 5 deletions demos/moveit_pick_place/run-demo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,23 @@ if [[ "$DETACH_MODE" == "true" ]]; then
fi

if docker compose version &> /dev/null; then
# shellcheck disable=SC2086
docker compose ${COMPOSE_ARGS} build ${BUILD_ARGS} && \
docker compose ${COMPOSE_ARGS} up ${DETACH_FLAG}
COMPOSE_CMD="docker compose"
else
COMPOSE_CMD="docker-compose"
fi

# shellcheck disable=SC2086
if ! ${COMPOSE_CMD} ${COMPOSE_ARGS} build ${BUILD_ARGS}; then
echo ""
echo "❌ Docker build failed! Stopping any partially created containers..."
# shellcheck disable=SC2086
docker-compose ${COMPOSE_ARGS} build ${BUILD_ARGS} && \
docker-compose ${COMPOSE_ARGS} up ${DETACH_FLAG}
${COMPOSE_CMD} ${COMPOSE_ARGS} down 2>/dev/null || true
exit 1
fi

# shellcheck disable=SC2086
${COMPOSE_CMD} ${COMPOSE_ARGS} up ${DETACH_FLAG}

if [[ "$DETACH_MODE" == "true" ]]; then
echo ""
echo "✅ Demo started in background!"
Expand Down
17 changes: 13 additions & 4 deletions demos/sensor_diagnostics/run-demo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,13 +93,22 @@ if [[ "$DETACH_MODE" == "true" ]]; then
fi

if docker compose version &> /dev/null; then
# shellcheck disable=SC2086
docker compose build ${BUILD_ARGS} && docker compose up ${DETACH_FLAG}
COMPOSE_CMD="docker compose"
else
# shellcheck disable=SC2086
docker-compose build ${BUILD_ARGS} && docker-compose up ${DETACH_FLAG}
COMPOSE_CMD="docker-compose"
fi

# shellcheck disable=SC2086
if ! ${COMPOSE_CMD} build ${BUILD_ARGS}; then
echo ""
echo "❌ Docker build failed! Stopping any partially created containers..."
${COMPOSE_CMD} down 2>/dev/null || true
exit 1
fi

# shellcheck disable=SC2086
${COMPOSE_CMD} up ${DETACH_FLAG}

if [[ "$DETACH_MODE" == "true" ]]; then
echo ""
echo "✅ Demo started in background!"
Expand Down
18 changes: 13 additions & 5 deletions demos/turtlebot3_integration/run-demo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,15 +144,23 @@ if [[ "$DETACH_MODE" == "true" ]]; then
fi

if docker compose version &> /dev/null; then
# shellcheck disable=SC2086
docker compose ${COMPOSE_ARGS} build ${BUILD_ARGS} && \
docker compose ${COMPOSE_ARGS} up ${DETACH_FLAG}
COMPOSE_CMD="docker compose"
else
COMPOSE_CMD="docker-compose"
fi

# shellcheck disable=SC2086
if ! ${COMPOSE_CMD} ${COMPOSE_ARGS} build ${BUILD_ARGS}; then
echo ""
echo "❌ Docker build failed! Stopping any partially created containers..."
# shellcheck disable=SC2086
docker-compose ${COMPOSE_ARGS} build ${BUILD_ARGS} && \
docker-compose ${COMPOSE_ARGS} up ${DETACH_FLAG}
${COMPOSE_CMD} ${COMPOSE_ARGS} down 2>/dev/null || true
exit 1
fi

# shellcheck disable=SC2086
${COMPOSE_CMD} ${COMPOSE_ARGS} up ${DETACH_FLAG}

if [[ "$DETACH_MODE" == "true" ]]; then
echo ""
echo "✅ Demo started in background!"
Expand Down