Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(docker): install CUDA developement libraries into -devel-cuda images #5446

Merged
merged 12 commits into from
Nov 19, 2024
Merged

fix(docker): install CUDA developement libraries into -devel-cuda images #5446

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
673f546
remove --runtime option
youtalk Nov 18, 2024
3b3f337
add cleanup_aptget
youtalk Nov 18, 2024
d647936
chmod +x
youtalk Nov 18, 2024
35ec7c7
use script
youtalk Nov 18, 2024
904df1a
style(pre-commit): autofix
pre-commit-ci[bot] Nov 18, 2024
06343dd
install to rosdep stage
youtalk Nov 18, 2024
49855ee
fix spell check
youtalk Nov 18, 2024
f8af5fe
Merge branch 'cleanup-aptget' into remove-runtime
youtalk Nov 18, 2024
3fb57f6
MUST REVERT
youtalk Nov 18, 2024
7798ad0
change order
youtalk Nov 18, 2024
d6f878c
Merge branch 'main' into remove-runtime
youtalk Nov 18, 2024
e1ebdc7
Revert "MUST REVERT"
youtalk Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BASE_IMAGE

# hadolint ignore=DL3006
FROM $BASE_IMAGE AS base

Check warning on line 4 in docker/Dockerfile

View workflow job for this annotation

GitHub Actions / docker-build

Default value for global ARG results in an empty or invalid base image name 

InvalidDefaultArgInFrom: Default value for ARG $BASE_IMAGE results in empty or invalid base image name
More info: https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ARG ROS_DISTRO

Expand Down Expand Up @@ -50,7 +50,7 @@
&& /autoware/cleanup_apt.sh true

# hadolint ignore=DL3006
FROM $BASE_IMAGE AS rosdep-depend

Check warning on line 53 in docker/Dockerfile

View workflow job for this annotation

GitHub Actions / docker-build

Default value for global ARG results in an empty or invalid base image name 

InvalidDefaultArgInFrom: Default value for ARG $BASE_IMAGE results in empty or invalid base image name
More info: https://docs.docker.com/go/dockerfile/rule/invalid-default-arg-in-from/
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
ARG ROS_DISTRO

Expand Down Expand Up @@ -222,7 +222,7 @@
# 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 @@
&& 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 @@
&& 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
Loading