Update runtime image

bounverif · Aug 1, 2024 · d9e747d · d9e747d
1 parent 2377d4f
commit d9e747d
Showing 1 changed file with 16 additions and 15 deletions.
diff --git a/containers/autoware-runtime/Dockerfile b/containers/autoware-runtime/Dockerfile
@@ -4,12 +4,12 @@ ARG AUTOWARE_VERSION=latest
 FROM ${IMAGE_NAME}:${AUTOWARE_VERSION}-builder-with-cache AS autoware-prebuilt
 ARG TARGETARCH TARGETOS TARGETPLATFORM TARGETVARIANT
 
-RUN --mount=type=bind,source=etc/autoware/autoware.repos.yml,target=/etc/autoware/autoware.repos.yml \
-    mkdir -p ${AUTOWARE_SOURCE_DIR} \
-    && vcs import --shallow ${AUTOWARE_SOURCE_DIR} < /etc/autoware/autoware.repos.yml && \
-    ccache --zero-stats && \
-    . /opt/ros/${ROS_DISTRO}/setup.sh && \
-    colcon --log-base /dev/null build \
+RUN --mount=type=bind,source=etc/autoware/autoware.repos.yml,target=/etc/autoware/autoware.repos.yml set -eux \
+    ; mkdir -p ${AUTOWARE_SOURCE_DIR} \
+    ; vcs import --shallow ${AUTOWARE_SOURCE_DIR} < /etc/autoware/autoware.repos.yml \
+    ; ccache --zero-stats \
+    ; . /opt/ros/${ROS_DISTRO}/setup.sh \
+    ; colcon --log-base /dev/null build \
         --base-paths ${AUTOWARE_SOURCE_DIR} \
         --build-base ${AUTOWARE_BUILD_DIR} \
         --install-base ${AUTOWARE_INSTALL_DIR} \
@@ -27,27 +27,28 @@ RUN --mount=type=bind,source=etc/autoware/autoware.repos.yml,target=/etc/autowar
             -DCMAKE_BUILD_TYPE=Release \
             " -Wno-dev" \
             " --no-warn-unused-cli" \
-    && rm -rf ${AUTOWARE_SOURCE_DIR} \
-    && rm -rf ${AUTOWARE_BUILD_DIR} \
-    && ccache -v --show-stats
+    ; rm -rf ${AUTOWARE_SOURCE_DIR} \
+    ; rm -rf ${AUTOWARE_BUILD_DIR} \
+    ; ccache -v --show-stats
 
 FROM ${IMAGE_NAME}:${AUTOWARE_VERSION}-base AS autoware-runtime
 ARG TARGETARCH TARGETOS TARGETPLATFORM TARGETVARIANT
 
 # This is not complete. It is just a placeholder for the final image.
 
-COPY --from=autoware-prebuilt ${AUTOWARE_INSTALL_DIR} ${AUTOWARE_INSTALL_DIR}
-
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked,id=${TARGETPLATFORM}/var/cache/apt \
-    export DEBIAN_FRONTEND=noninteractive && \
-    apt-get update && apt-get install -y --no-install-recommends \
+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-12-4 \
         libcurand-12-4 \
         libnvinfer8 \
         libnvinfer-plugin8 \
         libnvparsers8 \
         libnvonnxparsers8 \
-    && apt-get autoremove -y && rm -rf /var/lib/apt/lists/* 
+    ; apt-get autoremove -y \
+    ; rm -rf /var/lib/apt/lists/* 
+
+COPY --from=autoware-prebuilt ${AUTOWARE_INSTALL_DIR} ${AUTOWARE_INSTALL_DIR}
 
 ENV NVIDIA_VISIBLE_DEVICES=all
 ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility,graphics