diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 451ca87..17bb4eb 100644 --- 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 index 7018756..99a5b96 100644 --- 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 index 1912918..9881e7c 100644 --- 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 index 5910c89..8998c14 100644 --- 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 index 549aec4..1a3169d 100644 --- 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 = ["."]