Merge branch 'main' into cache-ccache

youtalk · May 21, 2024 · 744ee7b · 744ee7b
2 parents 5f2c077 + 7e2d39f
commit 744ee7b
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/docker/autoware-openadk/Dockerfile b/docker/autoware-openadk/Dockerfile
@@ -89,7 +89,6 @@ RUN --mount=type=ssh \
   && find / -name 'libnv*.a' -delete
 
 # Install rosdep dependencies
-COPY --from=src-imported /autoware/src /autoware/src
 COPY --from=src-imported /rosdep-all-depend-packages.txt /tmp/rosdep-all-depend-packages.txt
 # hadolint ignore=SC2002
 RUN --mount=type=ssh \
@@ -98,6 +97,7 @@ RUN --mount=type=ssh \
   && apt-get autoremove -y && apt-get clean -y && rm -rf /var/lib/apt/lists/* "$HOME"/.cache
 
 # Build Autoware
+COPY --from=src-imported /autoware/src /autoware/src
 RUN --mount=type=cache,target=/var/tmp/ccache source /opt/ros/"$ROS_DISTRO"/setup.bash \
   && colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release --cmake-args \
     " -Wno-dev" \
@@ -106,7 +106,7 @@ RUN --mount=type=cache,target=/var/tmp/ccache source /opt/ros/"$ROS_DISTRO"/setu
     -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
   && find /autoware/install -type d -exec chmod 777 {} \; \
   && chmod -R 777 /var/tmp/ccache \
-  && rm -rf /autoware/build
+  && rm -rf /autoware/build /autoware/src
 
 CMD ["/bin/bash"]