@@ -26,7 +26,8 @@ RUN apt-get -q update \
2626 && apt-get clean -y \
2727 && rm -rf /var/lib/apt/lists/*
2828
29- # Install all ROS dependencies
29+ # Install all ROS dependencies for _just_ blue
30+ # (we have not imported other repos from .repos files)
3031RUN apt-get -q update \
3132 && apt-get -q -y upgrade \
3233 && rosdep update \
@@ -36,6 +37,14 @@ RUN apt-get -q update \
3637 && apt-get clean -y \
3738 && rm -rf /var/lib/apt/lists/*
3839
40+ # This stage includes
41+ # - Switching to the non-root user
42+ # - Copying 'blue' source from this repo into the non-root user's workspace
43+ # - Installing blue deps using pip, apt and rosdep
44+ # - Installs the remaining blue dependencies from blue_robot.repos
45+ # - Installs deps from rosdep for all src dependencies
46+ # - colcon build
47+ #
3948FROM ci AS robot
4049
4150# Configure a new non-root user
@@ -88,14 +97,20 @@ RUN sudo apt-get -q update \
8897 && sudo apt-get clean -y \
8998 && sudo rm -rf /var/lib/apt/lists/*
9099
100+ WORKDIR $USER_WORKSPACE
91101RUN sudo apt-get -q update \
92102 && sudo apt-get -q -y upgrade \
103+ && vcs import src < src/blue/blue.repos \
93104 && rosdep update \
94105 && rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} \
95106 && sudo apt-get autoremove -y \
96107 && sudo apt-get clean -y \
97108 && sudo rm -rf /var/lib/apt/lists/*
98109
110+ # Actually build workspace
111+ RUN . "/opt/ros/${ROS_DISTRO}/setup.sh" \
112+ && colcon build
113+
99114RUN echo "source ${USER_WORKSPACE}/install/setup.bash" >> /home/$USERNAME/.bashrc \
100115 && echo "source /opt/ros/${ROS_DISTRO}/setup.bash" >> /home/$USERNAME/.bashrc
101116
@@ -161,7 +176,7 @@ RUN [ "/bin/bash" , "-c" , " \
161176WORKDIR $USER_WORKSPACE
162177RUN sudo apt-get -q update \
163178 && sudo apt-get -q -y upgrade \
164- && vcs import src < src/blue/blue .repos \
179+ && vcs import src < src/blue/sim .repos \
165180 && rosdep update \
166181 && rosdep install -y --from-paths src --ignore-src --rosdistro ${ROS_DISTRO} --skip-keys="gz-transport12 gz-sim7 gz-math7 gz-msgs9 gz-plugin2" \
167182 && sudo apt-get autoremove -y \
0 commit comments