From 39f266a55269e8cfa1ad7d04d8495bded13da48a Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Tue, 19 Nov 2024 11:56:12 +0900 Subject: [PATCH] fix(docker): install CUDA developement libraries into `-devel-cuda` images (#5446) * remove --runtime option Signed-off-by: Yutaka Kondo * add cleanup_aptget Signed-off-by: Yutaka Kondo * chmod +x Signed-off-by: Yutaka Kondo * use script Signed-off-by: Yutaka Kondo * style(pre-commit): autofix * install to rosdep stage Signed-off-by: Yutaka Kondo * fix spell check Signed-off-by: Yutaka Kondo * MUST REVERT Signed-off-by: Yutaka Kondo * change order Signed-off-by: Yutaka Kondo * Revert "MUST REVERT" This reverts commit 3fb57f620876b2a7f8f00a797370d52eaa25d1dd. --------- Signed-off-by: Yutaka Kondo Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f6338b4a17..8e9c9532a9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -222,7 +222,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"] # Set up CUDA development environment # hadolint ignore=SC2002 RUN --mount=type=ssh \ - ./setup-dev-env.sh -y --module all --no-cuda-drivers --runtime openadkit \ + ./setup-dev-env.sh -y --module all --no-cuda-drivers openadkit \ && pip uninstall -y ansible ansible-core \ && /autoware/cleanup_apt.sh true @@ -268,6 +268,8 @@ RUN --mount=type=ssh \ && cat /tmp/rosdep-universe-sensing-perception-depend-packages.txt | xargs apt-get install -y --no-install-recommends \ && /autoware/cleanup_apt.sh +COPY --from=universe-sensing-perception-devel /opt/autoware /opt/autoware + # hadolint ignore=SC1091 RUN --mount=type=cache,target=${CCACHE_DIR} \ # TODO(youtalk): Move CUDA related packages into a dedicated directory @@ -286,8 +288,6 @@ RUN --mount=type=cache,target=${CCACHE_DIR} \ && source /opt/autoware/setup.bash \ && /autoware/build_and_clean.sh ${CCACHE_DIR} /opt/autoware -COPY --from=universe-sensing-perception-devel /opt/autoware /opt/autoware - ENTRYPOINT ["/ros_entrypoint.sh"] CMD ["/bin/bash"]