From cbcb5de9f98416e348374a63631f79ed838cdb44 Mon Sep 17 00:00:00 2001
From: Dogan Ulus <dogan.ulus@bogazici.edu.tr>
Date: Mon, 5 Aug 2024 08:07:47 +0300
Subject: [PATCH] Fix prebuild stage

---
 containers/autoware-runtime/Dockerfile | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/containers/autoware-runtime/Dockerfile b/containers/autoware-runtime/Dockerfile
index 32de2c6..775a3e4 100644
--- a/containers/autoware-runtime/Dockerfile
+++ b/containers/autoware-runtime/Dockerfile
@@ -4,17 +4,17 @@ ARG AUTOWARE_VERSION=latest
 FROM ${IMAGE_NAME}:latest-builder-with-cache AS autoware-prebuilt
 # ARG TARGETARCH TARGETOS TARGETPLATFORM TARGETVARIANT
 
+ARG AUTOWARE_PACKAGES_UP_TO=autoware_launch
 WORKDIR ${AUTOWARE_ROOT}
 
 RUN --mount=type=bind,source=etc/autoware/autoware.repos.yml,target=/etc/autoware/autoware.repos.yml set -ex \
     ; mkdir -p src \
     ; vcs import --shallow src --input /etc/autoware/autoware.repos.yml \
-    ; export CCACHE_BASEDIR=${AUTOWARE_ROOT} \
+    ; . /opt/ros/${ROS_DISTRO}/setup.sh \
     ; ccache --show-config \
     ; ccache --zero-stats \
-    ; . /opt/ros/${ROS_DISTRO}/setup.sh \
     ; colcon --log-base /dev/null build \
-        --packages-up-to autoware_launch \
+        --packages-up-to ${AUTOWARE_PACKAGES_UP_TO} \
         --parallel-workers 4 \
         --event-handlers \
             console_direct- \
@@ -25,7 +25,6 @@ RUN --mount=type=bind,source=etc/autoware/autoware.repos.yml,target=/etc/autowar
             status- \
             summary+ \
             desktop_notification- \
-    ; rm -rf ${AUTOWARE_ROOT} \
     ; ccache -v --show-stats
 
 FROM ${IMAGE_NAME}:latest-base AS autoware-runtime