From fd3fb752d36af3ecb8e10ae0b91e0a8443809d2f Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Mon, 9 Jan 2023 15:49:48 -0800 Subject: [PATCH] github: update CI to buildkit v0.11 Signed-off-by: Tonis Tiigi (cherry picked from commit 571871b084d8c6ef1369cb740af01470e48b5dfd) --- .github/workflows/build.yml | 4 ++-- Dockerfile | 2 +- go.mod | 2 +- go.sum | 4 ++-- vendor/modules.txt | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 1b9081e0..bc85d175 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,8 +21,8 @@ on: - 'docs/**' env: - BUILDX_VERSION: "v0.10.0-rc1" - BUILDKIT_IMAGE: "moby/buildkit:v0.11.0-rc3" + BUILDX_VERSION: "v0.10.0-rc3" + BUILDKIT_IMAGE: "moby/buildkit:v0.11.0" REPO_SLUG: "docker/buildx-bin" DESTDIR: "./bin" diff --git a/Dockerfile b/Dockerfile index 07d9cc35..f1cc6a16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile-upstream:master +# syntax=docker/dockerfile-upstream:1.5.0 ARG GO_VERSION=1.19 ARG XX_VERSION=1.1.2 diff --git a/go.mod b/go.mod index 5498f308..0e621cde 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 github.com/hashicorp/go-cty-funcs v0.0.0-20200930094925-2721b1e36840 github.com/hashicorp/hcl/v2 v2.8.2 - github.com/moby/buildkit v0.11.0-rc4 + github.com/moby/buildkit v0.11.0 github.com/moby/sys/mountinfo v0.6.2 github.com/morikuni/aec v1.0.0 github.com/opencontainers/go-digest v1.0.0 diff --git a/go.sum b/go.sum index 55e69e87..6b5104ef 100644 --- a/go.sum +++ b/go.sum @@ -401,8 +401,8 @@ github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZX github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/moby/buildkit v0.11.0-rc4 h1:PxvzcqZn2IOrMzIS2nEqRQxk67xeSQnhdYxEj0YQuLM= -github.com/moby/buildkit v0.11.0-rc4/go.mod h1:v43oa6H2Fx/cdzc7j0UlUu8p6188yy1P3vrujAs99uw= +github.com/moby/buildkit v0.11.0 h1:GqBC/ETDqwdu61g4tCxX1GFZuGWg/nuqFxamb2or1dw= +github.com/moby/buildkit v0.11.0/go.mod h1:v43oa6H2Fx/cdzc7j0UlUu8p6188yy1P3vrujAs99uw= github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg= github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc= github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo= diff --git a/vendor/modules.txt b/vendor/modules.txt index 674930c6..efbd5aba 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -433,7 +433,7 @@ github.com/mitchellh/go-wordwrap # github.com/mitchellh/mapstructure v1.5.0 ## explicit; go 1.14 github.com/mitchellh/mapstructure -# github.com/moby/buildkit v0.11.0-rc4 +# github.com/moby/buildkit v0.11.0 ## explicit; go 1.18 github.com/moby/buildkit/api/services/control github.com/moby/buildkit/api/types