From 2a4719b4e8369d8b3c0ee0ac7c80170773f9e6a7 Mon Sep 17 00:00:00 2001
From: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Date: Tue, 26 Nov 2024 20:05:43 +0900
Subject: [PATCH 1/5] Revert "Revert "feat: use Docker Hub instead (#134)"
 (#138)"

This reverts commit ae4c4961d6f737f4eb510f5bccfd499bb74f2cf2.
---
 .../docker-build-and-push-cuda/action.yaml    | 20 ++++++-----
 .../actions/docker-build-and-push/action.yaml | 34 ++++++++++---------
 .github/actions/docker-build/action.yaml      | 10 +++---
 .../docker-build-and-push-arm64.yaml          | 16 +++++----
 .github/workflows/docker-build-and-push.yaml  | 14 ++++----
 .github/workflows/health-check-arm64.yaml     |  3 +-
 .github/workflows/health-check-nightly.yaml   |  1 +
 .github/workflows/health-check.yaml           |  1 +
 8 files changed, 56 insertions(+), 43 deletions(-)

diff --git a/.github/actions/docker-build-and-push-cuda/action.yaml b/.github/actions/docker-build-and-push-cuda/action.yaml
index fc28683d892..77334ddcbd5 100644
--- a/.github/actions/docker-build-and-push-cuda/action.yaml
+++ b/.github/actions/docker-build-and-push-cuda/action.yaml
@@ -11,6 +11,9 @@ inputs:
   build-args:
     description: Additional build args.
     required: false
+  dockerhub-token:
+    description: Docker Hub token.
+    required: true
 
 runs:
   using: composite
@@ -68,7 +71,7 @@ runs:
       id: meta-base-cuda
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=base-cuda-${{ inputs.platform }}
           type=raw,value=base-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -80,7 +83,7 @@ runs:
       id: meta-universe-sensing-perception-devel-cuda
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=universe-sensing-perception-devel-cuda-${{ inputs.platform }}
           type=raw,value=universe-sensing-perception-devel-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -92,7 +95,7 @@ runs:
       id: meta-universe-sensing-perception-cuda
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=universe-sensing-perception-cuda-${{ inputs.platform }}
           type=raw,value=universe-sensing-perception-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -104,7 +107,7 @@ runs:
       id: meta-universe-devel-cuda
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=universe-devel-cuda-${{ inputs.platform }}
           type=raw,value=universe-devel-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -116,7 +119,7 @@ runs:
       id: meta-universe-cuda
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=universe-cuda-${{ inputs.platform }}
           type=raw,value=universe-cuda-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -124,14 +127,13 @@ runs:
         flavor: |
           latest=auto
 
-    - name: Login to GitHub Container Registry
+    - name: Login to Docker Hub
       uses: docker/login-action@v3
       with:
-        registry: ghcr.io
         username: ${{ github.repository_owner }}
-        password: ${{ github.token }}
+        password: ${{ inputs.dockerhub-token }}
 
-    - name: Build and Push to GitHub Container Registry
+    - name: Build and Push to Docker Hub
       uses: docker/bake-action@v5
       with:
         push: true
diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml
index 3e3bc857fea..c33d23a98fa 100644
--- a/.github/actions/docker-build-and-push/action.yaml
+++ b/.github/actions/docker-build-and-push/action.yaml
@@ -11,6 +11,9 @@ inputs:
   build-args:
     description: Additional build args.
     required: false
+  dockerhub-token:
+    description: Docker Hub token.
+    required: true
 
 runs:
   using: composite
@@ -68,7 +71,7 @@ runs:
       id: meta-base
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=base-${{ inputs.platform }}
           type=raw,value=base-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -80,7 +83,7 @@ runs:
       id: meta-core-devel
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=core-devel-${{ inputs.platform }}
           type=raw,value=core-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -92,7 +95,7 @@ runs:
       id: meta-universe-sensing-perception-devel
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=universe-sensing-perception-devel-${{ inputs.platform }}
           type=raw,value=universe-sensing-perception-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -104,7 +107,7 @@ runs:
       id: meta-universe-sensing-perception
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=universe-sensing-perception-${{ inputs.platform }}
           type=raw,value=universe-sensing-perception-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -116,7 +119,7 @@ runs:
       id: meta-universe-localization-mapping-devel
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=universe-localization-mapping-devel-${{ inputs.platform }}
           type=raw,value=universe-localization-mapping-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -128,7 +131,7 @@ runs:
       id: meta-universe-localization-mapping
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=universe-localization-mapping-${{ inputs.platform }}
           type=raw,value=universe-localization-mapping-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -140,7 +143,7 @@ runs:
       id: meta-universe-planning-control-devel
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=universe-planning-control-devel-${{ inputs.platform }}
           type=raw,value=universe-planning-control-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -152,7 +155,7 @@ runs:
       id: meta-universe-planning-control
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=universe-planning-control-${{ inputs.platform }}
           type=raw,value=universe-planning-control-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -164,7 +167,7 @@ runs:
       id: meta-universe-vehicle-system-devel
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=universe-vehicle-system-devel-${{ inputs.platform }}
           type=raw,value=universe-vehicle-system-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -176,7 +179,7 @@ runs:
       id: meta-universe-vehicle-system
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=universe-vehicle-system-${{ inputs.platform }}
           type=raw,value=universe-vehicle-system-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -188,7 +191,7 @@ runs:
       id: meta-universe-devel
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=universe-devel-${{ inputs.platform }}
           type=raw,value=universe-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -200,7 +203,7 @@ runs:
       id: meta-universe
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=universe-${{ inputs.platform }}
           type=raw,value=universe-${{ steps.date.outputs.date }}-${{ inputs.platform }}
@@ -208,14 +211,13 @@ runs:
         flavor: |
           latest=auto
 
-    - name: Login to GitHub Container Registry
+    - name: Login to Docker Hub
       uses: docker/login-action@v3
       with:
-        registry: ghcr.io
         username: ${{ github.repository_owner }}
-        password: ${{ github.token }}
+        password: ${{ inputs.dockerhub-token }}
 
-    - name: Build and Push to GitHub Container Registry
+    - name: Build and Push to Docker Hub
       uses: docker/bake-action@v5
       with:
         push: true
diff --git a/.github/actions/docker-build/action.yaml b/.github/actions/docker-build/action.yaml
index d5bda73b4f3..534668a3041 100644
--- a/.github/actions/docker-build/action.yaml
+++ b/.github/actions/docker-build/action.yaml
@@ -15,6 +15,9 @@ inputs:
   build-args:
     description: Additional build args.
     required: false
+  dockerhub-token:
+    description: Docker Hub token.
+    required: true
 
 runs:
   using: composite
@@ -93,12 +96,11 @@ runs:
           }
         skip-extraction: ${{ steps.cache-ccache.outputs.cache-hit && steps.cache-apt-get.outputs.cache-hit }}
 
-    - name: Login to GitHub Container Registry
+    - name: Login to Docker Hub
       uses: docker/login-action@v3
       with:
-        registry: ghcr.io
         username: ${{ github.repository_owner }}
-        password: ${{ github.token }}
+        password: ${{ inputs.dockerhub-token }}
 
     - name: Run docker build
       uses: docker/build-push-action@v6
@@ -107,4 +109,4 @@ runs:
         context: .
         push: false
         build-args: ${{ inputs.build-args }}
-        cache-from: type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:${{ inputs.platform }}-${{ inputs.cache-tag-suffix }}
+        cache-from: type=registry,ref=${{ github.repository }}-buildcache:${{ inputs.platform }}-${{ inputs.cache-tag-suffix }}
diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml
index 1c1dacd09b8..a136291bf9d 100644
--- a/.github/workflows/docker-build-and-push-arm64.yaml
+++ b/.github/workflows/docker-build-and-push-arm64.yaml
@@ -13,7 +13,7 @@ jobs:
 
   docker-build-and-push:
     needs: load-env
-    runs-on: buildjet-16vcpu-ubuntu-2204-arm
+    runs-on: buildjet-8vcpu-ubuntu-2204-arm
     steps:
       - name: Check if PR author is the specific user
         id: author-check
@@ -63,9 +63,10 @@ jobs:
             *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
             *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_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
+            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:arm64-${{ github.ref_name }}
+            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:arm64-main
+            *.cache-to=type=registry,ref=${{ github.repository }}-buildcache:arm64-${{ github.ref_name }},mode=max
+          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Show disk space
         if: always()
@@ -110,9 +111,10 @@ jobs:
             *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
             *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_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
+            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:arm64-${{ github.ref_name }}
+            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:arm64-main
+            *.cache-to=type=registry,ref=${{ github.repository }}-buildcache:arm64-${{ github.ref_name }},mode=max
+          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Show disk space
         if: always()
diff --git a/.github/workflows/docker-build-and-push.yaml b/.github/workflows/docker-build-and-push.yaml
index e5af84da157..9263a3d24cc 100644
--- a/.github/workflows/docker-build-and-push.yaml
+++ b/.github/workflows/docker-build-and-push.yaml
@@ -63,9 +63,10 @@ jobs:
             *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
             *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
             *.args.LIB_DIR=x86_64
-            *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:amd64-${{ github.ref_name }}
-            *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:amd64-main
-            *.cache-to=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:amd64-${{ github.ref_name }},mode=max
+            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:amd64-${{ github.ref_name }}
+            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:amd64-main
+            *.cache-to=type=registry,ref=${{ github.repository }}-buildcache:amd64-${{ github.ref_name }},mode=max
+          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Show disk space
         if: always()
@@ -110,9 +111,10 @@ jobs:
             *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
             *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
             *.args.LIB_DIR=x86_64
-            *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:amd64-${{ github.ref_name }}
-            *.cache-from=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:amd64-main
-            *.cache-to=type=registry,ref=ghcr.io/${{ github.repository }}-buildcache:amd64-${{ github.ref_name }},mode=max
+            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:amd64-${{ github.ref_name }}
+            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:amd64-main
+            *.cache-to=type=registry,ref=${{ github.repository }}-buildcache:amd64-${{ github.ref_name }},mode=max
+          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Show disk space
         if: always()
diff --git a/.github/workflows/health-check-arm64.yaml b/.github/workflows/health-check-arm64.yaml
index ec142373121..cabcd249d01 100644
--- a/.github/workflows/health-check-arm64.yaml
+++ b/.github/workflows/health-check-arm64.yaml
@@ -11,7 +11,7 @@ jobs:
 
   docker-build:
     needs: load-env
-    runs-on: buildjet-16vcpu-ubuntu-2204-arm
+    runs-on: buildjet-8vcpu-ubuntu-2204-arm
     steps:
       # https://github.com/actions/checkout/issues/211
       - name: Change permission of workspace
@@ -35,6 +35,7 @@ jobs:
             ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
             BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
             LIB_DIR=aarch64
+          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Show disk space
         if: always()
diff --git a/.github/workflows/health-check-nightly.yaml b/.github/workflows/health-check-nightly.yaml
index ae79cabdeb4..04832788ce1 100644
--- a/.github/workflows/health-check-nightly.yaml
+++ b/.github/workflows/health-check-nightly.yaml
@@ -51,6 +51,7 @@ jobs:
             ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
             BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
             LIB_DIR=x86_64
+          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Show disk space
         if: always()
diff --git a/.github/workflows/health-check.yaml b/.github/workflows/health-check.yaml
index d65a3239cff..df9f0cce651 100644
--- a/.github/workflows/health-check.yaml
+++ b/.github/workflows/health-check.yaml
@@ -45,6 +45,7 @@ jobs:
             ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
             BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
             LIB_DIR=x86_64
+          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Show disk space
         if: always()

From ce520e3f4860b3e6034b1f7aa3ce67c2326abbae Mon Sep 17 00:00:00 2001
From: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Date: Tue, 26 Nov 2024 20:08:45 +0900
Subject: [PATCH 2/5] fix autoware-base

Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>
---
 .../actions/docker-build-and-push-base/action.yaml   | 12 +++++++-----
 .github/workflows/autoware-base.yaml                 |  2 ++
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/actions/docker-build-and-push-base/action.yaml b/.github/actions/docker-build-and-push-base/action.yaml
index 8a5a779904a..99133711f9b 100644
--- a/.github/actions/docker-build-and-push-base/action.yaml
+++ b/.github/actions/docker-build-and-push-base/action.yaml
@@ -8,6 +8,9 @@ inputs:
   build-args:
     description: Additional build args.
     required: false
+  dockerhub-token:
+    description: Docker Hub token.
+    required: true
 
 runs:
   using: composite
@@ -24,7 +27,7 @@ runs:
       id: meta-base
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=${{ steps.date.outputs.date }}
         bake-target: docker-metadata-action-base
@@ -35,7 +38,7 @@ runs:
       id: meta-base-cuda
       uses: docker/metadata-action@v5
       with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
+        images: ${{ github.repository_owner }}/${{ inputs.target-image }}
         tags: |
           type=raw,value=cuda-latest
           type=raw,value=cuda-${{ steps.date.outputs.date }}
@@ -43,12 +46,11 @@ runs:
         flavor: |
           latest=false
 
-    - name: Login to GitHub Container Registry
+    - name: Login to Docker Hub
       uses: docker/login-action@v3
       with:
-        registry: ghcr.io
         username: ${{ github.repository_owner }}
-        password: ${{ github.token }}
+        password: ${{ inputs.dockerhub-token }}
 
     - name: Build and Push to GitHub Container Registry
       uses: docker/bake-action@v5
diff --git a/.github/workflows/autoware-base.yaml b/.github/workflows/autoware-base.yaml
index e3d9720bcc4..5560b8c88b5 100644
--- a/.github/workflows/autoware-base.yaml
+++ b/.github/workflows/autoware-base.yaml
@@ -27,6 +27,7 @@ jobs:
             *.platform=linux/amd64
             *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
             *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
+          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
 
   autoware-base-arm64:
     needs: [load-env, autoware-base-amd64]
@@ -49,3 +50,4 @@ jobs:
             *.platform=linux/arm64
             *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
             *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
+          dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}

From 7e2685ef65c2e5e3e283b564e16473c9718ac71f Mon Sep 17 00:00:00 2001
From: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Date: Tue, 26 Nov 2024 20:54:33 +0900
Subject: [PATCH 3/5] change order

Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>
---
 .../actions/docker-build-and-push-base/action.yaml   | 12 ++++++------
 .../actions/docker-build-and-push-cuda/action.yaml   | 12 ++++++------
 .github/actions/docker-build-and-push/action.yaml    | 12 ++++++------
 .github/actions/docker-build/action.yaml             | 12 ++++++------
 4 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.github/actions/docker-build-and-push-base/action.yaml b/.github/actions/docker-build-and-push-base/action.yaml
index 99133711f9b..7912be7a231 100644
--- a/.github/actions/docker-build-and-push-base/action.yaml
+++ b/.github/actions/docker-build-and-push-base/action.yaml
@@ -15,6 +15,12 @@ inputs:
 runs:
   using: composite
   steps:
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ github.repository_owner }}
+        password: ${{ inputs.dockerhub-token }}
+
     - name: Setup Docker Buildx
       uses: docker/setup-buildx-action@v3
 
@@ -46,12 +52,6 @@ runs:
         flavor: |
           latest=false
 
-    - name: Login to Docker Hub
-      uses: docker/login-action@v3
-      with:
-        username: ${{ github.repository_owner }}
-        password: ${{ inputs.dockerhub-token }}
-
     - name: Build and Push to GitHub Container Registry
       uses: docker/bake-action@v5
       with:
diff --git a/.github/actions/docker-build-and-push-cuda/action.yaml b/.github/actions/docker-build-and-push-cuda/action.yaml
index 77334ddcbd5..4df6ca4df7b 100644
--- a/.github/actions/docker-build-and-push-cuda/action.yaml
+++ b/.github/actions/docker-build-and-push-cuda/action.yaml
@@ -18,6 +18,12 @@ inputs:
 runs:
   using: composite
   steps:
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ github.repository_owner }}
+        password: ${{ inputs.dockerhub-token }}
+
     - name: Install jq and vcstool
       run: |
         sudo apt-get -y update
@@ -127,12 +133,6 @@ runs:
         flavor: |
           latest=auto
 
-    - name: Login to Docker Hub
-      uses: docker/login-action@v3
-      with:
-        username: ${{ github.repository_owner }}
-        password: ${{ inputs.dockerhub-token }}
-
     - name: Build and Push to Docker Hub
       uses: docker/bake-action@v5
       with:
diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml
index c33d23a98fa..12bd1aed22a 100644
--- a/.github/actions/docker-build-and-push/action.yaml
+++ b/.github/actions/docker-build-and-push/action.yaml
@@ -18,6 +18,12 @@ inputs:
 runs:
   using: composite
   steps:
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ github.repository_owner }}
+        password: ${{ inputs.dockerhub-token }}
+
     - name: Install jq and vcstool
       run: |
         sudo apt-get -y update
@@ -211,12 +217,6 @@ runs:
         flavor: |
           latest=auto
 
-    - name: Login to Docker Hub
-      uses: docker/login-action@v3
-      with:
-        username: ${{ github.repository_owner }}
-        password: ${{ inputs.dockerhub-token }}
-
     - name: Build and Push to Docker Hub
       uses: docker/bake-action@v5
       with:
diff --git a/.github/actions/docker-build/action.yaml b/.github/actions/docker-build/action.yaml
index 534668a3041..03c922d8631 100644
--- a/.github/actions/docker-build/action.yaml
+++ b/.github/actions/docker-build/action.yaml
@@ -22,6 +22,12 @@ inputs:
 runs:
   using: composite
   steps:
+    - name: Login to Docker Hub
+      uses: docker/login-action@v3
+      with:
+        username: ${{ github.repository_owner }}
+        password: ${{ inputs.dockerhub-token }}
+
     - name: Setup Docker Buildx
       uses: docker/setup-buildx-action@v3
 
@@ -96,12 +102,6 @@ runs:
           }
         skip-extraction: ${{ steps.cache-ccache.outputs.cache-hit && steps.cache-apt-get.outputs.cache-hit }}
 
-    - name: Login to Docker Hub
-      uses: docker/login-action@v3
-      with:
-        username: ${{ github.repository_owner }}
-        password: ${{ inputs.dockerhub-token }}
-
     - name: Run docker build
       uses: docker/build-push-action@v6
       with:

From 4c3e782abbc62170ee3268ffc9d6a1f32de0c99f Mon Sep 17 00:00:00 2001
From: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Date: Tue, 26 Nov 2024 20:57:08 +0900
Subject: [PATCH 4/5] Update .github/workflows/docker-build-and-push-arm64.yaml

---
 .github/workflows/docker-build-and-push-arm64.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml
index a136291bf9d..cee46ad84eb 100644
--- a/.github/workflows/docker-build-and-push-arm64.yaml
+++ b/.github/workflows/docker-build-and-push-arm64.yaml
@@ -13,7 +13,7 @@ jobs:
 
   docker-build-and-push:
     needs: load-env
-    runs-on: buildjet-8vcpu-ubuntu-2204-arm
+    runs-on: buildjet-16vcpu-ubuntu-2204-arm
     steps:
       - name: Check if PR author is the specific user
         id: author-check

From 680b44007d45534feb394de2841004eae04e6296 Mon Sep 17 00:00:00 2001
From: Yutaka Kondo <yutaka.kondo@youtalk.jp>
Date: Tue, 26 Nov 2024 20:57:14 +0900
Subject: [PATCH 5/5] Update .github/workflows/health-check-arm64.yaml

---
 .github/workflows/health-check-arm64.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/health-check-arm64.yaml b/.github/workflows/health-check-arm64.yaml
index cabcd249d01..00905ab7c49 100644
--- a/.github/workflows/health-check-arm64.yaml
+++ b/.github/workflows/health-check-arm64.yaml
@@ -11,7 +11,7 @@ jobs:
 
   docker-build:
     needs: load-env
-    runs-on: buildjet-8vcpu-ubuntu-2204-arm
+    runs-on: buildjet-16vcpu-ubuntu-2204-arm
     steps:
       # https://github.com/actions/checkout/issues/211
       - name: Change permission of workspace