diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 35905796..38790eed 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,8 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 + with: + version: latest - name: Test run: | @@ -102,6 +104,7 @@ jobs: name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 with: + version: latest driver-opts: image=moby/buildkit:master buildkitd-flags: --debug - diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 41c8dfa4..c1c8b83b 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -51,6 +51,11 @@ jobs: name: Set up QEMU uses: docker/setup-qemu-action@v1 if: matrix.driver == 'docker' || matrix.driver == 'docker-container' + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + with: + version: latest - name: Install buildx run: | diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index f28f8aaa..64862b78 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -27,6 +27,11 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + with: + version: latest - name: Run run: | @@ -40,6 +45,11 @@ jobs: - name: Checkout uses: actions/checkout@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + with: + version: latest - name: Run run: | diff --git a/Dockerfile b/Dockerfile index 804050b0..6d0051d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.3 +# syntax=docker/dockerfile:1.4 ARG GO_VERSION=1.17 ARG DOCKERD_VERSION=20.10.8 diff --git a/docker-bake.hcl b/docker-bake.hcl index 036683f1..3d07c460 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -89,11 +89,7 @@ target "mod-outdated" { inherits = ["_common"] dockerfile = "./hack/dockerfiles/vendor.Dockerfile" target = "outdated" - args = { - // used to invalidate cache for outdated run stage - // can be dropped when https://github.com/moby/buildkit/issues/1213 fixed - _RANDOM = uuidv4() - } + no-cache-filter = ["outdated"] output = ["type=cacheonly"] } diff --git a/docs/reference/buildx_build.md b/docs/reference/buildx_build.md index ff89f0fa..94ecd614 100644 --- a/docs/reference/buildx_build.md +++ b/docs/reference/buildx_build.md @@ -429,7 +429,7 @@ Attribute keys: - `src`, `source` - Secret filename. `id` used if unset. ```dockerfile -# syntax=docker/dockerfile:1.3 +# syntax=docker/dockerfile:1.4 FROM python:3 RUN pip install awscli RUN --mount=type=secret,id=aws,target=/root/.aws/credentials \ @@ -448,7 +448,7 @@ Attribute keys: - `env` - Secret environment variable. `id` used if unset, otherwise will look for `src`, `source` if `id` unset. ```dockerfile -# syntax=docker/dockerfile:1.3 +# syntax=docker/dockerfile:1.4 FROM node:alpine RUN --mount=type=bind,target=. \ --mount=type=secret,id=SECRET_TOKEN \ @@ -480,7 +480,7 @@ authentication (e.g., cloning a private repository). Example to access Gitlab using an SSH agent socket: ```dockerfile -# syntax=docker/dockerfile:1.3 +# syntax=docker/dockerfile:1.4 FROM alpine RUN apk add --no-cache openssh-client RUN mkdir -p -m 0700 ~/.ssh && ssh-keyscan gitlab.com >> ~/.ssh/known_hosts diff --git a/hack/dockerfiles/authors.Dockerfile b/hack/dockerfiles/authors.Dockerfile index 68a1a90b..827ccc9b 100644 --- a/hack/dockerfiles/authors.Dockerfile +++ b/hack/dockerfiles/authors.Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.3-labs +# syntax=docker/dockerfile:1.4 FROM alpine:3.14 AS gen RUN apk add --no-cache git diff --git a/hack/dockerfiles/docs.Dockerfile b/hack/dockerfiles/docs.Dockerfile index b7a9d6aa..d2805315 100644 --- a/hack/dockerfiles/docs.Dockerfile +++ b/hack/dockerfiles/docs.Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.3-labs +# syntax=docker/dockerfile:1.4 ARG GO_VERSION=1.17 ARG FORMATS=md,yaml diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile index f0338a46..89b63459 100644 --- a/hack/dockerfiles/lint.Dockerfile +++ b/hack/dockerfiles/lint.Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.3 +# syntax=docker/dockerfile:1.4 ARG GO_VERSION=1.17 diff --git a/hack/dockerfiles/vendor.Dockerfile b/hack/dockerfiles/vendor.Dockerfile index 73b53cb0..387e07d9 100644 --- a/hack/dockerfiles/vendor.Dockerfile +++ b/hack/dockerfiles/vendor.Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.3-labs +# syntax=docker/dockerfile:1.4 ARG GO_VERSION=1.17 ARG MODOUTDATED_VERSION=v0.8.0 @@ -39,7 +39,6 @@ EOT FROM psampaz/go-mod-outdated:${MODOUTDATED_VERSION} AS go-mod-outdated FROM base AS outdated -ARG _RANDOM RUN --mount=target=.,ro \ --mount=target=/go/pkg/mod,type=cache \ --mount=from=go-mod-outdated,source=/home/go-mod-outdated,target=/usr/bin/go-mod-outdated \