From b3f8e6c6042c74a7adca79409b0eee10dfc32827 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Thu, 6 Jun 2024 11:43:24 +0900 Subject: [PATCH 1/2] fix colcon cmake-args Signed-off-by: Yutaka Kondo --- docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 3f0a53c0a8..d97b55c8cd 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -90,11 +90,11 @@ RUN --mount=type=ssh \ COPY --from=src-imported /autoware/src /autoware/src RUN --mount=type=cache,target=${CCACHE_DIR} \ source /opt/ros/"$ROS_DISTRO"/setup.bash \ - && colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release --cmake-args \ - " -Wno-dev" \ - " --no-warn-unused-cli" \ + && colcon build --cmake-args \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ + " -Wno-dev" \ + " --no-warn-unused-cli" \ && find /autoware/install -type d -exec chmod 777 {} \; \ && chmod -R 777 /var/tmp/ccache \ && rm -rf /autoware/build /autoware/src From 7d6e3a198e7f27c284e65cb7b5497fa63fd8a06a Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Mon, 10 Jun 2024 11:44:03 +0900 Subject: [PATCH 2/2] use mixin Signed-off-by: Yutaka Kondo --- docker/Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index d97b55c8cd..492ae514a4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -66,8 +66,6 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] ARG ROS_DISTRO ARG SETUP_ARGS ENV CCACHE_DIR="/var/tmp/ccache" -ENV CC="/usr/lib/ccache/gcc" -ENV CXX="/usr/lib/ccache/g++" # cspell: ignore libcu libnv # Set up development environment @@ -91,10 +89,9 @@ COPY --from=src-imported /autoware/src /autoware/src RUN --mount=type=cache,target=${CCACHE_DIR} \ source /opt/ros/"$ROS_DISTRO"/setup.bash \ && colcon build --cmake-args \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ " -Wno-dev" \ " --no-warn-unused-cli" \ + --mixin release compile-commands ccache \ && find /autoware/install -type d -exec chmod 777 {} \; \ && chmod -R 777 /var/tmp/ccache \ && rm -rf /autoware/build /autoware/src