feat: update docker name and rm src

AutomotiveAIChallenge · Nov 20, 2023 · f4b18f1 · f4b18f1
1 parent 631c0ad
commit f4b18f1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/docker/autoware-universe/Dockerfile b/docker/autoware-universe/Dockerfile
@@ -65,7 +65,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 ## Build and change permission for runtime data conversion
 RUN source /opt/ros/"$ROS_DISTRO"/setup.bash \
-  && colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release --symlink-install\
+  && colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release \
   && find /autoware/install -type d -exec chmod 777 {} \;
 
 # hadolint ignore=DL3006
@@ -102,6 +102,7 @@ RUN --mount=type=ssh \
   && vcs import src < autoware.repos \
   && rosdep update \
   && DEBIAN_FRONTEND=noninteractive rosdep install -y --ignore-src --from-paths src --rosdistro "$ROS_DISTRO" \
+&& rm -rf src \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 

diff --git a/docker/build.sh b/docker/build.sh
@@ -71,7 +71,7 @@ docker buildx bake --no-cache --load --progress=plain -f "$SCRIPT_DIR/autoware-u
     --set "*.args.BASE_IMAGE=$base_image" \
     --set "*.args.PREBUILT_BASE_IMAGE=$prebuilt_base_image" \
     --set "*.args.SETUP_ARGS=$setup_args" \
-    --set "devel.tags=ghcr.io/autowarefoundation/autoware-universe:$rosdistro-latest$image_name_suffix" \
-    --set "prebuilt.tags=ghcr.io/autowarefoundation/autoware-universe:$rosdistro-latest-prebuilt$image_name_suffix" \
+    --set "devel.tags=ghcr.io/automotiveaichallenge/aichallenge2023-racing/autoware-universe-no-cuda-no-build:latest$image_name_suffix" \
+    --set "prebuilt.tags=ghcr.io/automotiveaichallenge/aichallenge2023-racing/autoware-universe-no-cuda:latest$image_name_suffix" \
     "${targets[@]}"
 set +x
diff --git a/docker/prebuilt/Dockerfile b/docker/prebuilt/Dockerfile
@@ -9,7 +9,7 @@ WORKDIR /autoware
 
 ## Build and change permission for runtime data conversion
 RUN source /opt/ros/"$ROS_DISTRO"/setup.bash \
-  && colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release --symlink-install \
+  && colcon build --cmake-args -DCMAKE_BUILD_TYPE=Release \
   && find /autoware/install -type d -exec chmod 777 {} \;
 
 ## Create entrypoint