Skip to content

Commit

Permalink
Merge branch 'ros2' into ros2-robot-utils
Browse files Browse the repository at this point in the history
  • Loading branch information
DominikN authored Dec 11, 2023
2 parents b3b4a3e + 8919443 commit 1823c9d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Dockerfile.hardware
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RUN mkdir src && \
install(TARGETS healthcheck_node DESTINATION lib/${PROJECT_NAME})' \
/ros2_ws/src/healthcheck_pkg/CMakeLists.txt

COPY healthcheck.cpp src/healthcheck_pkg/src/
COPY healthcheck.cpp src/healthcheck_pkg/src/

RUN MYDISTRO=${PREFIX:-ros}; MYDISTRO=${MYDISTRO//-/} && \
source /opt/$MYDISTRO/$ROS_DISTRO/setup.bash && \
Expand Down Expand Up @@ -85,7 +85,7 @@ RUN git clone --depth 1 -b humble https://github.com/husarion/rosbot_ros.git src
rm -rf build log

## =========================== Final Stage ===============================
FROM husarnet/ros:${PREFIX}${ROS_DISTRO}-ros-core
FROM husarnet/ros:${PREFIX}${ROS_DISTRO}-ros-core

ARG ROS_DISTRO
ARG PREFIX
Expand Down Expand Up @@ -132,5 +132,5 @@ COPY print-serial-number.py /usr/bin/

ENV ROS_NAMESPACE=

HEALTHCHECK --interval=5s --timeout=2s --start-period=5s --retries=6 \
HEALTHCHECK --interval=5s --timeout=2s --start-period=10s --retries=6 \
CMD ["/healthcheck.sh"]

0 comments on commit 1823c9d

Please sign in to comment.