update docker-build-and-push

Signed-off-by: Yutaka Kondo <[email protected]>
youtalk · Oct 18, 2024 · dbb1dfa · dbb1dfa
1 parent 9752940
commit dbb1dfa
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 90 deletions.
diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml
@@ -2,9 +2,6 @@ name: docker-build-and-push
 description: ""
 
 inputs:
-  name:
-    description: ""
-    required: true
   platform:
     description: ""
     required: true
@@ -14,9 +11,6 @@ inputs:
   build-args:
     description: ""
     required: false
-  tag-suffix:
-    description: ""
-    required: false
   dockerhub-token:
     description: ""
     required: true
@@ -45,19 +39,17 @@ runs:
       with:
         path: |
           root-ccache
-        key: ccache-${{ inputs.platform }}-${{ inputs.name }}-${{ hashFiles('src/**/*.cpp') }}
+        key: ccache-${{ inputs.platform }}-${{ hashFiles('src/**/*.cpp') }}
         restore-keys: |
-          ccache-${{ inputs.platform }}-${{ inputs.name }}-
           ccache-${{ inputs.platform }}-
 
     - name: Restore apt-get
       uses: actions/cache/restore@v4
       with:
         path: |
           var-cache-apt
-        key: apt-get-${{ inputs.platform }}-${{ inputs.name }}-${{ hashFiles('src/**/package.xml') }}
+        key: apt-get-${{ inputs.platform }}-${{ hashFiles('src/**/package.xml') }}
         restore-keys: |
-          apt-get-${{ inputs.platform }}-${{ inputs.name }}-
           apt-get-${{ inputs.platform }}-
 
     - name: Inject cache into docker
@@ -81,8 +73,8 @@ runs:
       with:
         images: ${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=base${{ inputs.tag-suffix }}-${{ inputs.platform }}
-          type=raw,value=base${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}-${{ inputs.platform }}
+          type=raw,value=base-${{ inputs.platform }}
+          type=raw,value=base-${{ steps.date.outputs.date }}-${{ inputs.platform }}
         bake-target: docker-metadata-action-base
         flavor: |
           latest=false
@@ -93,8 +85,8 @@ runs:
       with:
         images: ${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=core-devel${{ inputs.tag-suffix }}-${{ inputs.platform }}
-          type=raw,value=core-devel${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}-${{ inputs.platform }}
+          type=raw,value=core-devel-${{ inputs.platform }}
+          type=raw,value=core-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }}
         bake-target: docker-metadata-action-core-devel
         flavor: |
           latest=false
@@ -105,8 +97,8 @@ runs:
       with:
         images: ${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-sensing-perception-devel${{ inputs.tag-suffix }}-${{ inputs.platform }}
-          type=raw,value=universe-sensing-perception-devel${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}-${{ inputs.platform }}
+          type=raw,value=universe-sensing-perception-devel-${{ inputs.platform }}
+          type=raw,value=universe-sensing-perception-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }}
         bake-target: docker-metadata-action-universe-sensing-perception-devel
         flavor: |
           latest=false
@@ -117,8 +109,8 @@ runs:
       with:
         images: ${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-sensing-perception${{ inputs.tag-suffix }}-${{ inputs.platform }}
-          type=raw,value=universe-sensing-perception${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}-${{ inputs.platform }}
+          type=raw,value=universe-sensing-perception-${{ inputs.platform }}
+          type=raw,value=universe-sensing-perception-${{ steps.date.outputs.date }}-${{ inputs.platform }}
         bake-target: docker-metadata-action-universe-sensing-perception
         flavor: |
           latest=false
@@ -129,8 +121,8 @@ runs:
       with:
         images: ${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-localization-mapping-devel${{ inputs.tag-suffix }}-${{ inputs.platform }}
-          type=raw,value=universe-localization-mapping-devel${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}-${{ inputs.platform }}
+          type=raw,value=universe-localization-mapping-devel-${{ inputs.platform }}
+          type=raw,value=universe-localization-mapping-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }}
         bake-target: docker-metadata-action-universe-localization-mapping-devel
         flavor: |
           latest=false
@@ -141,8 +133,8 @@ runs:
       with:
         images: ${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-localization-mapping${{ inputs.tag-suffix }}-${{ inputs.platform }}
-          type=raw,value=universe-localization-mapping${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}-${{ inputs.platform }}
+          type=raw,value=universe-localization-mapping-${{ inputs.platform }}
+          type=raw,value=universe-localization-mapping-${{ steps.date.outputs.date }}-${{ inputs.platform }}
         bake-target: docker-metadata-action-universe-localization-mapping
         flavor: |
           latest=false
@@ -153,8 +145,8 @@ runs:
       with:
         images: ${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-planning-control-devel${{ inputs.tag-suffix }}-${{ inputs.platform }}
-          type=raw,value=universe-planning-control-devel${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}-${{ inputs.platform }}
+          type=raw,value=universe-planning-control-devel-${{ inputs.platform }}
+          type=raw,value=universe-planning-control-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }}
         bake-target: docker-metadata-action-universe-planning-control-devel
         flavor: |
           latest=false
@@ -165,8 +157,8 @@ runs:
       with:
         images: ${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-planning-control${{ inputs.tag-suffix }}-${{ inputs.platform }}
-          type=raw,value=universe-planning-control${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}-${{ inputs.platform }}
+          type=raw,value=universe-planning-control-${{ inputs.platform }}
+          type=raw,value=universe-planning-control-${{ steps.date.outputs.date }}-${{ inputs.platform }}
         bake-target: docker-metadata-action-universe-planning-control
         flavor: |
           latest=false
@@ -177,8 +169,8 @@ runs:
       with:
         images: ${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-vehicle-system-devel${{ inputs.tag-suffix }}-${{ inputs.platform }}
-          type=raw,value=universe-vehicle-system-devel${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}-${{ inputs.platform }}
+          type=raw,value=universe-vehicle-system-devel-${{ inputs.platform }}
+          type=raw,value=universe-vehicle-system-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }}
         bake-target: docker-metadata-action-universe-vehicle-system-devel
         flavor: |
           latest=false
@@ -189,8 +181,8 @@ runs:
       with:
         images: ${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-vehicle-system${{ inputs.tag-suffix }}-${{ inputs.platform }}
-          type=raw,value=universe-vehicle-system${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}-${{ inputs.platform }}
+          type=raw,value=universe-vehicle-system-${{ inputs.platform }}
+          type=raw,value=universe-vehicle-system-${{ steps.date.outputs.date }}-${{ inputs.platform }}
         bake-target: docker-metadata-action-universe-vehicle-system
         flavor: |
           latest=false
@@ -201,8 +193,8 @@ runs:
       with:
         images: ${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe-devel${{ inputs.tag-suffix }}-${{ inputs.platform }}
-          type=raw,value=universe-devel${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}-${{ inputs.platform }}
+          type=raw,value=universe-devel-${{ inputs.platform }}
+          type=raw,value=universe-devel-${{ steps.date.outputs.date }}-${{ inputs.platform }}
         bake-target: docker-metadata-action-universe-devel
         flavor: |
           latest=false
@@ -213,8 +205,8 @@ runs:
       with:
         images: ${{ github.repository_owner }}/${{ inputs.bake-target }}
         tags: |
-          type=raw,value=universe${{ inputs.tag-suffix }}-${{ inputs.platform }}
-          type=raw,value=universe${{ inputs.tag-suffix }}-${{ steps.date.outputs.date }}-${{ inputs.platform }}
+          type=raw,value=universe-${{ inputs.platform }}
+          type=raw,value=universe-${{ steps.date.outputs.date }}-${{ inputs.platform }}
         bake-target: docker-metadata-action-universe
         flavor: |
           latest=auto

diff --git a/.github/workflows/docker-build-and-push-arm64.yaml b/.github/workflows/docker-build-and-push-arm64.yaml
@@ -14,24 +14,6 @@ jobs:
   docker-build-and-push:
     needs: load-env
     runs-on: buildjet-16vcpu-ubuntu-2204-arm
-    strategy:
-      fail-fast: false
-      matrix:
-        name:
-          - no-cuda
-          - cuda
-        include:
-          - name: no-cuda
-            platform: arm64
-            base_image_env: base_image
-            lib_dir: aarch64
-            setup-args: --no-nvidia
-            tag-suffix: ""
-          - name: cuda
-            platform: arm64
-            base_image_env: base_image
-            lib_dir: aarch64
-            tag-suffix: -cuda
     steps:
       - name: Check if PR author is the specific user
         id: author-check
@@ -74,19 +56,16 @@ jobs:
           (github.event_name == 'push' && github.ref_type == 'tag') }}
         uses: ./.github/actions/docker-build-and-push
         with:
-          name: ${{ matrix.name }}
-          platform: ${{ matrix.platform }}
+          platform: arm64
           bake-target: autoware
           build-args: |
-            *.platform=linux/${{ matrix.platform }}
+            *.platform=linux/arm64
             *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
-            *.args.BASE_IMAGE=${{ needs.load-env.outputs[format('{0}', matrix.base_image_env)] }}
-            *.args.SETUP_ARGS=${{ matrix.setup-args }}
-            *.args.LIB_DIR=${{ matrix.lib_dir }}
-            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:${{ matrix.name }}-${{ matrix.platform }}-${{ github.head_ref }}
-            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:${{ matrix.name }}-${{ matrix.platform }}-main
-            *.cache-to=type=registry,ref=${{ github.repository }}-buildcache:${{ matrix.name }}-${{ matrix.platform }}-${{ github.head_ref }},mode=max
-          tag-suffix: ${{ matrix.tag-suffix }}
+            *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
+            *.args.LIB_DIR=aarch64
+            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:arm64-${{ github.head_ref }}
+            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:arm64-main
+            *.cache-to=type=registry,ref=${{ github.repository }}-buildcache:arm64-${{ github.head_ref }},mode=max
           dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Show disk space

diff --git a/.github/workflows/docker-build-and-push.yaml b/.github/workflows/docker-build-and-push.yaml
@@ -14,24 +14,6 @@ jobs:
   docker-build-and-push:
     needs: load-env
     runs-on: buildjet-16vcpu-ubuntu-2204
-    strategy:
-      fail-fast: false
-      matrix:
-        name:
-          - no-cuda
-          - cuda
-        include:
-          - name: no-cuda
-            platform: amd64
-            base_image_env: base_image
-            lib_dir: x86_64
-            setup-args: --no-nvidia
-            tag-suffix: ""
-          - name: cuda
-            platform: amd64
-            base_image_env: base_image
-            lib_dir: x86_64
-            tag-suffix: -cuda
     steps:
       - name: Check if PR author is the specific user
         id: author-check
@@ -74,19 +56,16 @@ jobs:
           (github.event_name == 'push' && github.ref_type == 'tag') }}
         uses: ./.github/actions/docker-build-and-push
         with:
-          name: ${{ matrix.name }}
-          platform: ${{ matrix.platform }}
+          platform: amd64
           bake-target: autoware
           build-args: |
-            *.platform=linux/${{ matrix.platform }}
+            *.platform=linux/amd64
             *.args.ROS_DISTRO=${{ needs.load-env.outputs.rosdistro }}
-            *.args.BASE_IMAGE=${{ needs.load-env.outputs[format('{0}', matrix.base_image_env)] }}
-            *.args.SETUP_ARGS=${{ matrix.setup-args }}
-            *.args.LIB_DIR=${{ matrix.lib_dir }}
-            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:${{ matrix.name }}-${{ matrix.platform }}-${{ github.head_ref }}
-            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:${{ matrix.name }}-${{ matrix.platform }}-main
-            *.cache-to=type=registry,ref=${{ github.repository }}-buildcache:${{ matrix.name }}-${{ matrix.platform }}-${{ github.head_ref }},mode=max
-          tag-suffix: ${{ matrix.tag-suffix }}
+            *.args.BASE_IMAGE=${{ needs.load-env.outputs.base_image }}
+            *.args.LIB_DIR=x86_64
+            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:amd64-${{ github.head_ref }}
+            *.cache-from=type=registry,ref=${{ github.repository }}-buildcache:amd64-main
+            *.cache-to=type=registry,ref=${{ github.repository }}-buildcache:amd64-${{ github.head_ref }},mode=max
           dockerhub-token: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Show disk space