Merge pull request #546 from crazy-max/bake-v6

update bake-action to v6
docker · Jan 8, 2025 · e36200f · e36200f
2 parents 7811a01 + d973aa3
commit e36200f
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,12 +22,9 @@ jobs:
           - 20
           - 18
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
       -
         name: Build
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
           targets: build
         env:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -13,15 +13,12 @@ jobs:
   publish:
     runs-on: ubuntu-latest
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
       -
         name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       -
         name: Publish
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
           targets: publish
         env:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -28,12 +28,9 @@ jobs:
           - 20
           - 18
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
       -
         name: Test
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
           targets: test-coverage
         env:

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -25,7 +25,7 @@ jobs:
       -
         name: List targets
         id: generate
-        uses: docker/bake-action/subaction/list-targets@v5
+        uses: docker/bake-action/subaction/list-targets@v6
         with:
           target: validate
 
@@ -38,11 +38,8 @@ jobs:
       matrix:
         target: ${{ fromJson(needs.prepare.outputs.targets) }}
     steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
       -
         name: Validate
-        uses: docker/bake-action@v5
+        uses: docker/bake-action@v6
         with:
           targets: ${{ matrix.target }}
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -30,6 +30,7 @@ group "validate" {
 
 target "_common" {
   args = {
+    BUILDKIT_CONTEXT_KEEP_GIT_DIR = 1
     NODE_VERSION = NODE_VERSION
   }
 }
@@ -76,6 +77,7 @@ target "dockerfile-validate" {
       "./hack/dockerfiles/license.Dockerfile"
     ]
   }
+  inherits = ["_common"]
   name = "dockerfile-validate-${md5(dockerfile)}"
   dockerfile = dockerfile
   call = "check"
@@ -115,12 +117,14 @@ target "publish" {
 }
 
 target "license-validate" {
+  inherits = ["_common"]
   dockerfile = "./hack/dockerfiles/license.Dockerfile"
   target = "validate"
   output = ["type=cacheonly"]
 }
 
 target "license-update" {
+  inherits = ["_common"]
   dockerfile = "./hack/dockerfiles/license.Dockerfile"
   target = "update"
   output = ["."]