fix hcl

Signed-off-by: Yutaka Kondo <yutaka.kondo@youtalk.jp>
autowarefoundation · Nov 27, 2024 · 6b5a735 · 6b5a735
1 parent 5d8abf1
commit 6b5a735
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 42 deletions.
diff --git a/.github/actions/docker-build-and-push-cuda/action.yaml b/.github/actions/docker-build-and-push-cuda/action.yaml
@@ -64,18 +64,6 @@ runs:
       run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
       shell: bash
 
-    - name: Docker meta for autoware:base-cuda
-      id: meta-base-cuda
-      uses: docker/metadata-action@v5
-      with:
-        images: ghcr.io/${{ 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 }}
-        bake-target: docker-metadata-action-base-cuda
-        flavor: |
-          latest=false
-
     - name: Docker meta for autoware:universe-sensing-perception-devel-cuda
       id: meta-universe-sensing-perception-devel-cuda
       uses: docker/metadata-action@v5
@@ -137,7 +125,6 @@ runs:
         push: true
         files: |
           docker/docker-bake-cuda.hcl
-          ${{ steps.meta-base-cuda.outputs.bake-file }}
           ${{ steps.meta-universe-sensing-perception-devel-cuda.outputs.bake-file }}
           ${{ steps.meta-universe-sensing-perception-cuda.outputs.bake-file }}
           ${{ steps.meta-universe-devel-cuda.outputs.bake-file }}

diff --git a/.github/actions/docker-build-and-push/action.yaml b/.github/actions/docker-build-and-push/action.yaml
@@ -64,18 +64,6 @@ runs:
       run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
       shell: bash
 
-    - name: Docker meta for autoware:base
-      id: meta-base
-      uses: docker/metadata-action@v5
-      with:
-        images: ghcr.io/${{ github.repository_owner }}/${{ inputs.target-image }}
-        tags: |
-          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
-
     - name: Docker meta for autoware:core-devel
       id: meta-core-devel
       uses: docker/metadata-action@v5
@@ -221,7 +209,6 @@ runs:
         push: true
         files: |
           docker/docker-bake.hcl
-          ${{ steps.meta-base.outputs.bake-file }}
           ${{ steps.meta-core-devel.outputs.bake-file }}
           ${{ steps.meta-universe-sensing-perception-devel.outputs.bake-file }}
           ${{ steps.meta-universe-sensing-perception.outputs.bake-file }}

diff --git a/docker/docker-bake-cuda.hcl b/docker/docker-bake-cuda.hcl
@@ -1,6 +1,5 @@
 group "default" {
   targets = [
-    "base-cuda",
     "universe-sensing-perception-devel-cuda",
     "universe-sensing-perception-cuda",
     "universe-devel-cuda",
@@ -9,18 +8,11 @@ group "default" {
 }
 
 // For docker/metadata-action
-target "docker-metadata-action-base-cuda" {}
 target "docker-metadata-action-universe-sensing-perception-devel-cuda" {}
 target "docker-metadata-action-universe-sensing-perception-cuda" {}
 target "docker-metadata-action-universe-devel-cuda" {}
 target "docker-metadata-action-universe-cuda" {}
 
-target "base-cuda" {
-  inherits = ["docker-metadata-action-base-cuda"]
-  dockerfile = "docker/Dockerfile"
-  target = "base-cuda"
-}
-
 target "universe-sensing-perception-devel-cuda" {
   inherits = ["docker-metadata-action-universe-sensing-perception-devel-cuda"]
   dockerfile = "docker/Dockerfile"

diff --git a/docker/docker-bake.hcl b/docker/docker-bake.hcl
@@ -1,6 +1,5 @@
 group "default" {
   targets = [
-    "base",
     "core-devel",
     "universe-sensing-perception-devel",
     "universe-sensing-perception",
@@ -16,7 +15,6 @@ group "default" {
 }
 
 // For docker/metadata-action
-target "docker-metadata-action-base" {}
 target "docker-metadata-action-core-devel" {}
 target "docker-metadata-action-universe-sensing-perception-devel" {}
 target "docker-metadata-action-universe-sensing-perception" {}
@@ -29,12 +27,6 @@ target "docker-metadata-action-universe-vehicle-system" {}
 target "docker-metadata-action-universe-devel" {}
 target "docker-metadata-action-universe" {}
 
-target "base" {
-  inherits = ["docker-metadata-action-base"]
-  dockerfile = "docker/Dockerfile"
-  target = "base"
-}
-
 target "core-devel" {
   inherits = ["docker-metadata-action-core-devel"]
   dockerfile = "docker/Dockerfile"