Skip to content

Commit

Permalink
fix(docker): install CUDA developement libraries into -devel-cuda i…
Browse files Browse the repository at this point in the history
…mages (#5446)

* remove --runtime option

Signed-off-by: Yutaka Kondo <[email protected]>

* add cleanup_aptget

Signed-off-by: Yutaka Kondo <[email protected]>

* chmod +x

Signed-off-by: Yutaka Kondo <[email protected]>

* use script

Signed-off-by: Yutaka Kondo <[email protected]>

* style(pre-commit): autofix

* install to rosdep stage

Signed-off-by: Yutaka Kondo <[email protected]>

* fix spell check

Signed-off-by: Yutaka Kondo <[email protected]>

* MUST REVERT

Signed-off-by: Yutaka Kondo <[email protected]>

* change order

Signed-off-by: Yutaka Kondo <[email protected]>

* Revert "MUST REVERT"

This reverts commit 3fb57f6.

---------

Signed-off-by: Yutaka Kondo <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
youtalk and pre-commit-ci[bot] authored Nov 19, 2024
1 parent 0dd0883 commit 39f266a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand All @@ -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"]

Expand Down

0 comments on commit 39f266a

Please sign in to comment.