From 9ce15464a17d16118560e56084733a724dec1f70 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Tue, 21 May 2024 19:23:28 +0900 Subject: [PATCH 1/2] refine order and remove /autoware/src at last --- docker/autoware-openadk/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/autoware-openadk/Dockerfile b/docker/autoware-openadk/Dockerfile index 24cdee9b7ca..c171d0a7ac5 100644 --- a/docker/autoware-openadk/Dockerfile +++ b/docker/autoware-openadk/Dockerfile @@ -89,15 +89,15 @@ 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 +COPY --from=src-imported /rosdep-all-depend-packages.txt /tmp/rosdep-all-depend-packages.txt RUN --mount=type=ssh \ apt-get update \ && cat /tmp/rosdep-all-depend-packages.txt | xargs apt-get install -y --no-install-recommends \ && 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 source /opt/ros/"$ROS_DISTRO"/setup.bash \ && colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release --cmake-args \ " -Wno-dev" \ @@ -106,7 +106,7 @@ RUN source /opt/ros/"$ROS_DISTRO"/setup.bash \ -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"] From 156bce5784056f2eab175b9fc0d2fbeac436d742 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Tue, 21 May 2024 19:34:47 +0900 Subject: [PATCH 2/2] fix hadolint --- docker/autoware-openadk/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/autoware-openadk/Dockerfile b/docker/autoware-openadk/Dockerfile index c171d0a7ac5..e0c8bd51c9b 100644 --- a/docker/autoware-openadk/Dockerfile +++ b/docker/autoware-openadk/Dockerfile @@ -89,8 +89,8 @@ RUN --mount=type=ssh \ && find / -name 'libnv*.a' -delete # Install rosdep dependencies -# hadolint ignore=SC2002 COPY --from=src-imported /rosdep-all-depend-packages.txt /tmp/rosdep-all-depend-packages.txt +# hadolint ignore=SC2002 RUN --mount=type=ssh \ apt-get update \ && cat /tmp/rosdep-all-depend-packages.txt | xargs apt-get install -y --no-install-recommends \