[do not merge] testing my BuildKit PR #1949

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed

thaJeztah wants to merge 5 commits into docker:master from thaJeztah:buildkit_0.12_test

go.mod

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,6 +2,9 @@ module github.com/docker/buildx
  
    go 1.20

    // FIXME(thaJeztah): testing https://github.com/moby/buildkit/pull/4027

    replace github.com/moby/buildkit => github.com/thaJeztah/buildkit v0.0.0-20230717085851-619a20df406b

    require (

    	github.com/Masterminds/semver/v3 v3.2.1

    	github.com/aws/aws-sdk-go-v2/config v1.18.16

    @@ -23,7 +26,7 @@ require (
  
    	github.com/google/uuid v1.3.0

    	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-rc3.0.20230620112432-2d91ddcceedc

    	github.com/moby/buildkit v0.12.0

    	github.com/moby/sys/mountinfo v0.6.2

    	github.com/moby/sys/signal v0.7.0

    	github.com/morikuni/aec v1.0.0

    @@ -139,10 +142,10 @@ require (
  
    	github.com/shibumi/go-pathspec v1.3.0 // indirect

    	github.com/spf13/viper v1.14.0 // indirect

    	github.com/theupdateframework/notary v0.6.1 // indirect

    	github.com/tonistiigi/fsutil v0.0.0-20230407161946-9e7a6df48576 // indirect

    	github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb // indirect

    	github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect

    	github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f // indirect

    	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect

    	github.com/tonistiigi/vt100 v0.0.0-20230623042737-f9a4f7ef6531 // indirect

    	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect

    	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect

    	github.com/xeipuuv/gojsonschema v1.2.0 // indirect

    	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0 // indirect

go.sum

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -372,8 +372,6 @@ github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7 h1:DpOJ2HYzC
  
    github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=

    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-rc3.0.20230620112432-2d91ddcceedc h1:79EnLqFEkPn6sTBXDHE546AHmYeb/QzXgGyIpli8w34=

    github.com/moby/buildkit v0.11.0-rc3.0.20230620112432-2d91ddcceedc/go.mod h1:6Y1HYDrxg3sY5gBY2FVaEvQpswBj3g/ck7aKYCjOkk0=

    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=

    @@ -483,20 +481,23 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
  
    github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=

    github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=

    github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs=

    github.com/thaJeztah/buildkit v0.0.0-20230717085851-619a20df406b h1:FTXpE9v9xxCUDcNa3y8nqEKcde9dlURQvHyPz3Ed7qM=

    github.com/thaJeztah/buildkit v0.0.0-20230717085851-619a20df406b/go.mod h1:+n9GmkxwBCjVz4u7wmiyh+oqvjIjQM+1zk3iJrWfdos=

    github.com/theupdateframework/notary v0.6.1 h1:7wshjstgS9x9F5LuB1L5mBI2xNMObWqjz+cjWoom6l0=

    github.com/theupdateframework/notary v0.6.1/go.mod h1:MOfgIfmox8s7/7fduvB2xyPPMJCrjRLRizA8OFwpnKY=

    github.com/tonistiigi/fsutil v0.0.0-20230407161946-9e7a6df48576 h1:fZXPQDVh5fm2x7pA0CH1TtH80tiZ0L7i834kZqZN8Pw=

    github.com/tonistiigi/fsutil v0.0.0-20230407161946-9e7a6df48576/go.mod h1:q1CxMSzcAbjUkVGHoZeQUcCaALnaE4XdWk+zJcgMYFw=

    github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb h1:uUe8rNyVXM8moActoBol6Xf6xX2GMr7SosR2EywMvGg=

    github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb/go.mod h1:SxX/oNQ/ag6Vaoli547ipFK9J7BZn5JqJG0JE8lf8bA=

    github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea h1:SXhTLE6pb6eld/v/cCndK0AMpt1wiVFb/YYmqB3/QG0=

    github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea/go.mod h1:WPnis/6cRcDZSUvVmezrxJPkiO87ThFYsoUiMwWNDJk=

    github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f h1:DLpt6B5oaaS8jyXHa9VA4rrZloBVPVXeCtrOsrFauxc=

    github.com/tonistiigi/vt100 v0.0.0-20210615222946-8066bb97264f/go.mod h1:ulncasL3N9uLrVann0m+CDlJKWsIAP34MPcOJF6VRvc=

    github.com/tonistiigi/vt100 v0.0.0-20230623042737-f9a4f7ef6531 h1:Y/M5lygoNPKwVNLMPXgVfsRT40CSFKXCxuU8LoHySjs=

    github.com/tonistiigi/vt100 v0.0.0-20230623042737-f9a4f7ef6531/go.mod h1:ulncasL3N9uLrVann0m+CDlJKWsIAP34MPcOJF6VRvc=

    github.com/vbatts/tar-split v0.11.2 h1:Via6XqJr0hceW4wff3QRzD5gAk/tatMw/4ZA7cTlIME=

    github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=

    github.com/vmihailenco/msgpack/v4 v4.3.12/go.mod h1:gborTTJjAo/GWTqqRjrLCn9pgNN+NXzzngzBKDPIqw4=

    github.com/vmihailenco/tagparser v0.1.1/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=

    github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c=

    github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=

    github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=

    github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=

    github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=

    github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=

    github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=

util/imagetools/inspect.go

-Original file line number
+Diff line change
@@ Expand Up @@
     	if err != nil {
     		return "", nil, err
     	}
-    	return imageutil.Config(ctx, in, r.resolver(), r.buffer, nil, platform)
+    	_, dgst, data, err := imageutil.Config(ctx, in, r.resolver(), r.buffer, nil, platform, nil)
+    	return dgst, data, err
     }

vendor/github.com/moby/buildkit/AUTHORS

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

vendor/github.com/moby/buildkit/client/client.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[do not merge] testing my BuildKit PR #1949

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!