From a009764f98215ff119086a5b71a197dcd3229cd6 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Mon, 27 Jan 2025 11:21:36 +0900 Subject: [PATCH 1/2] append pipefail Signed-off-by: Yutaka Kondo --- docker/scripts/build_and_clean.sh | 2 +- docker/scripts/cleanup_apt.sh | 2 +- docker/scripts/cleanup_system.sh | 2 +- docker/scripts/resolve_rosdep_keys.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/scripts/build_and_clean.sh b/docker/scripts/build_and_clean.sh index f5f383f1565..d8afececf3d 100755 --- a/docker/scripts/build_and_clean.sh +++ b/docker/scripts/build_and_clean.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -eo pipefail function build_and_clean() { local ccache_dir=$1 diff --git a/docker/scripts/cleanup_apt.sh b/docker/scripts/cleanup_apt.sh index f3a47e58296..4b559ca9cb3 100755 --- a/docker/scripts/cleanup_apt.sh +++ b/docker/scripts/cleanup_apt.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -eo pipefail function cleanup_apt() { local apt_clean=$1 diff --git a/docker/scripts/cleanup_system.sh b/docker/scripts/cleanup_system.sh index 72127927ecf..614fe0493c9 100755 --- a/docker/scripts/cleanup_system.sh +++ b/docker/scripts/cleanup_system.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -eo pipefail function cleanup_system() { local lib_dir=$1 diff --git a/docker/scripts/resolve_rosdep_keys.sh b/docker/scripts/resolve_rosdep_keys.sh index 1b3f5839bd2..5d978e2bff6 100755 --- a/docker/scripts/resolve_rosdep_keys.sh +++ b/docker/scripts/resolve_rosdep_keys.sh @@ -1,5 +1,5 @@ #!/bin/bash -set -e +set -eo pipefail function resolve_rosdep_keys() { local src_path=$1 From 901d698956eff58e6459f4be9370043c96a27c47 Mon Sep 17 00:00:00 2001 From: Yutaka Kondo Date: Mon, 27 Jan 2025 20:55:35 +0900 Subject: [PATCH 2/2] copy tensorrt_common and cuda_utils Signed-off-by: Yutaka Kondo --- docker/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/Dockerfile b/docker/Dockerfile index b4b56698a9e..3ad5fa3ee97 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -31,6 +31,8 @@ RUN rosdep update && /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO COPY src/universe/external /autoware/src/universe/external COPY src/universe/autoware.universe/common /autoware/src/universe/autoware.universe/common +COPY src/universe/autoware.universe/perception/autoware_tensorrt_common /autoware/src/universe/autoware.universe/perception/autoware_tensorrt_common +COPY src/universe/autoware.universe/sensing/autoware_cuda_utils /autoware/src/universe/autoware.universe/sensing/autoware_cuda_utils RUN /autoware/resolve_rosdep_keys.sh /autoware/src ${ROS_DISTRO} \ > /rosdep-universe-common-depend-packages.txt \ && cat /rosdep-universe-common-depend-packages.txt