.

Signed-off-by: Oguz Ozturk <[email protected]>
autowarefoundation · Feb 6, 2025 · 33ba71b · 33ba71b
1 parent 9236720
commit 33ba71b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 24 deletions.
diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml
@@ -72,22 +72,21 @@ jobs:
             *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-main
             *.cache-to=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-${{ github.ref_name }},mode=max
 
-      # TODO: Uncomment once arm64 builds are FIXED
-      # - name: Build 'autoware-tools'
-      #   uses: ./.github/actions/docker-build-and-push-tools
-      #   with:
-      #     platform: arm64
-      #     target-image: autoware-tools
-      #     build-args: |
-      #       *.platform=linux/arm64
-      #       *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
-      #       *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
-      #       *.args.AUTOWARE_BASE_IMAGE=${{ needs.load-env.outputs.autoware_base_image }}
-      #       *.args.AUTOWARE_BASE_CUDA_IMAGE=${{ needs.load-env.outputs.autoware_base_cuda_image }}
-      #       *.args.LIB_DIR=aarch64
-      #       *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-${{ github.ref_name }}
-      #       *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-main
-      #       *.cache-to=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-${{ github.ref_name }},mode=max
+      - name: Build 'autoware-tools'
+        uses: ./.github/actions/docker-build-and-push-tools
+        with:
+          platform: arm64
+          target-image: autoware-tools
+          build-args: |
+            *.platform=linux/arm64
+            *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
+            *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
+            *.args.AUTOWARE_BASE_IMAGE=${{ needs.load-env.outputs.autoware_base_image }}
+            *.args.AUTOWARE_BASE_CUDA_IMAGE=${{ needs.load-env.outputs.autoware_base_cuda_image }}
+            *.args.LIB_DIR=aarch64
+            *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-${{ github.ref_name }}
+            *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-main
+            *.cache-to=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:arm64-${{ github.ref_name }},mode=max
 
       - name: Show disk space
         if: always()

diff --git a/docker/tools/scenario-simulator/Dockerfile.scenario-simulator b/docker/tools/scenario-simulator/Dockerfile.scenario-simulator
@@ -1,6 +1,5 @@
 ### Builder
-# TODO: Remove architecture specific image after arm64 builds are FIXED
-FROM ghcr.io/autowarefoundation/autoware:universe-devel-amd64 AS builder
+FROM ghcr.io/autowarefoundation/autoware:universe-devel AS builder
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ARG ROS_DISTRO
 ARG LIB_DIR
@@ -35,8 +34,7 @@ RUN /autoware/resolve_rosdep_keys.sh /autoware/src/simulator ${ROS_DISTRO} \
     && cat /rosdep-simulator-depend-packages.txt
 
 ### Scenario Simulator
-# TODO: Remove architecture specific image after arm64 builds are FIXED
-FROM ghcr.io/autowarefoundation/autoware:universe-visualization-amd64 AS scenario-simulator
+FROM ghcr.io/autowarefoundation/autoware:universe-visualization AS scenario-simulator
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ARG ROS_DISTRO
 ARG LIB_DIR

diff --git a/docker/tools/visualizer/Dockerfile.visualizer b/docker/tools/visualizer/Dockerfile.visualizer
@@ -1,8 +1,7 @@
 # cspell:ignore openbox, VNC, tigervnc, novnc, websockify, newkey, xstartup, keyout
 
 ### Builder
-# TODO: Remove architecture specific image after arm64 builds are working
-FROM ghcr.io/autowarefoundation/autoware:universe-visualization-devel-amd64 AS builder
+FROM ghcr.io/autowarefoundation/autoware:universe-visualization-devel AS builder
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ENV CCACHE_DIR="/root/.ccache"
 ARG ROS_DISTRO
@@ -37,8 +36,7 @@ RUN source /opt/ros/"$ROS_DISTRO"/setup.bash && source /opt/autoware/setup.bash
     && cat /rosdep-visualizer-depend-packages.txt
 
 ### visualizer
-# TODO: Remove architecture specific image after arm64 builds are working
-FROM ghcr.io/autowarefoundation/autoware:universe-visualization-amd64 AS visualizer
+FROM ghcr.io/autowarefoundation/autoware:universe-visualization AS visualizer
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ARG ROS_DISTRO
 ARG LIB_DIR