Update runtime image

bounverif · Aug 4, 2024 · c7d4adb · c7d4adb
1 parent cf30378
commit c7d4adb
Showing 1 changed file with 10 additions and 13 deletions.
diff --git a/containers/autoware-runtime/Dockerfile b/containers/autoware-runtime/Dockerfile
@@ -3,13 +3,12 @@ ARG AUTOWARE_DEVEL_VERSION=latest
 ARG AUTOWARE_VERSION=latest
 
 FROM ${IMAGE_NAME}:${AUTOWARE_DEVEL_VERSION}-builder-with-cache AS autoware-prebuilt
-ARG TARGETARCH TARGETOS TARGETPLATFORM TARGETVARIANT
+# ARG TARGETARCH TARGETOS TARGETPLATFORM TARGETVARIANT
 
 RUN --mount=type=bind,source=etc/autoware/autoware.repos.yml,target=/etc/autoware/autoware.repos.yml set -ex \
-    ; set -ex \
     ; mkdir -p ${AUTOWARE_SOURCE_DIR} \
-    ; vcs import --shallow ${AUTOWARE_SOURCE_DIR} < /etc/autoware/autoware.repos.yml \
-    ; export CCACHE_DEBUG=1 \
+    ; vcs import --shallow ${AUTOWARE_SOURCE_DIR} --input /etc/autoware/autoware.repos.yml \
+    ; export CCACHE_BASEDIR=${AUTOWARE_ROOT} \
     ; ccache --show-config \
     ; ccache --zero-stats \
     ; . /opt/ros/${ROS_DISTRO}/setup.sh \
@@ -25,26 +24,24 @@ RUN --mount=type=bind,source=etc/autoware/autoware.repos.yml,target=/etc/autowar
             console_cohesion- \
             console_start_end- \
             console_package_list- \
-            status- \
+            status+ \
             summary+ \
             desktop_notification- \
-        --cmake-args \
-            " -Wno-dev" \
-            " --no-warn-unused-cli" \
-    ; rm -rf ${AUTOWARE_SOURCE_DIR} \
-    ; rm -rf ${AUTOWARE_BUILD_DIR} \
+        --cmake-args -DCMAKE_BUILD_TYPE=Release \
+    ; rm -rf ${AUTOWARE_ROOT} \
     ; ccache -v --show-stats
 
 FROM ${IMAGE_NAME}:${AUTOWARE_DEVEL_VERSION}-base AS autoware-runtime
 ARG TARGETARCH TARGETOS TARGETPLATFORM TARGETVARIANT
 
 # This is not complete. It is just a placeholder for the final image.
-
+ARG CUDA_TOOLKIT_VERSION_MAJOR=12 
+ARG CUDA_TOOLKIT_VERSION_MINOR=6
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=${TARGETPLATFORM}/var/cache/apt set -eux \
     ; export DEBIAN_FRONTEND=noninteractive \
     ; apt-get -qq update && apt-get install -qqy --no-install-recommends \
-        libcublas-${CUDA_TOOLKIT_VERSION_DASHED} \
-        libcurand-${CUDA_TOOLKIT_VERSION_DASHED} \
+        libcublas-${CUDA_TOOLKIT_VERSION_MAJOR}-${CUDA_TOOLKIT_VERSION_MINOR} \
+        libcurand-${CUDA_TOOLKIT_VERSION_MAJOR}-${CUDA_TOOLKIT_VERSION_MINOR} \
         libnvinfer8 \
         libnvinfer-plugin8 \
         libnvparsers8 \