Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
fred-labs committed Jul 30, 2024
1 parent e3e9a77 commit 43f9d8a
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
"ros-${ROS_DISTRO}-rmw-cyclonedds-cpp" \
"ros-${ROS_DISTRO}-ros-gz-interfaces" \
python3-pip \
$(cat /tmp_setup/deb_requirements.txt) && \
"$(cat /tmp_setup/deb_requirements.txt)" && \
rm -rf /var/lib/apt/lists/*

COPY .devcontainer/ros_entrypoint.sh /ros_entrypoint.sh
Expand All @@ -39,11 +39,11 @@ RUN chmod +x /ros_entrypoint.sh

RUN --mount=type=bind,target=/tmp_setup export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
rosdep update --rosdistro=${ROS_DISTRO} && \
rosdep update --rosdistro="${ROS_DISTRO}" && \
for d in "/tmp_setup/*"; do \
[[ ! -d "$d" ]] && continue; \
[[ "$(basename $d)" =~ ^(install|build|log)$ ]] && continue; \
rosdep install --rosdistro=${ROS_DISTRO} --from-paths "$d" --ignore-src -r -y; \
rosdep install --rosdistro="${ROS_DISTRO}" --from-paths "$d" --ignore-src -r -y; \
done && \
rm -rf /var/lib/apt/lists/*

Expand Down Expand Up @@ -71,9 +71,6 @@ USER $USER
##############################################################################

WORKDIR /workspace
RUN . "/opt/ros/$ROS_DISTRO/setup.sh" \
&& colcon build
# --symlink-install

RUN printf "if [ -f /workspace/install/setup.bash ]; then \n\
source /workspace/install/setup.bash \n\
Expand Down

0 comments on commit 43f9d8a

Please sign in to comment.