Skip to content

[20.10 backport] update buildx to v0.6.1 #562

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.

Sign up for GitHub

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

Jump to bottom
Merged
thaJeztah merged 3 commits into from
Jul 30, 2021
Merged

[20.10 backport] update buildx to v0.6.1 #562

thaJeztah merged 3 commits into from
Jul 30, 2021

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Jul 28, 2021 •
edited
Loading

@thaJeztah
Copy link
Member Author

thaJeztah commented Jul 28, 2021

This will fail until #564 is merged

@thaJeztah thaJeztah marked this pull request as draft July 28, 2021 20:22
@thaJeztah thaJeztah force-pushed the 20.10_backport_bump_buildx_0.6 branch from c3f7237 to 9d7701f Compare July 28, 2021 20:22
@thaJeztah
Copy link
Member Author

thaJeztah commented Jul 28, 2021

Temporarily included #564 to verify it works with that PR (I'll rebase after that's merged)

thaJeztah added 2 commits July 29, 2021 13:05
@thaJeztah
plugins/buildx: enable go modules to fix invalid //import comment
88e9275 
The buildkit vendor in buildx contains an incorrect `//import` comment, which
causes compile to fail if go modules are disabled.

Without `GO111MODULE` set (but with `-mod=vendor`:

    echo $GO111MODULE

    export PKG=github.com/docker/buildx
    export LDFLAGS="-X ${PKG}/version.Version=$(git describe --match 'v[0-9]*' --always --tags) -X ${PKG}/version.Revision=$(git rev-parse HEAD) -X ${PKG}/version.Package=${PKG}"
    GOFLAGS=-mod=vendor go build -o bin/docker-buildx -ldflags "${LDFLAGS}" ./cmd/buildx
    bin/docker-buildx version
    github.com/docker/buildx v0.6.0 d9ee3b134cbc2d09513fa7fee4176a3919e05887

When setting `GO111MODULE=off`, it fails on the incorrect import path in the
vendored file (looks like GO111MODULE=on ignores import-path comments?):

    export GO111MODULE=off
    root@5a55ec1c1eed:/go/src/github.com/docker/buildx# GOFLAGS=-mod=vendor go build -o bin/docker-buildx -ldflags "${LDFLAGS}" ./cmd/buildx
    vendor/github.com/moby/buildkit/client/client.go:20:2: code in directory /go/src/github.com/docker/buildx/vendor/github.com/moby/buildkit/util/tracing/otlptracegrpc expects import "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
    vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/connection/connection.go:33:2: found import comments "go.opentelemetry.io/otel/exporters/otlp/internal/otlpconfig" (options.go) and "go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlpconfig" (optiontypes.go) in /go/src/github.com/docker/buildx/vendor/go.opentelemetry.io/otel/exporters/otlp/otlptrace/internal/otlpconfig

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 5b9172b)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
update buildx to v0.6.0
208a1f9 
release notes: https://github.com/docker/buildx/releases/tag/v0.6.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
(cherry picked from commit 7593a3f)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the 20.10_backport_bump_buildx_0.6 branch from 9d7701f to 208a1f9 Compare July 29, 2021 11:05
@thaJeztah thaJeztah marked this pull request as ready for review July 29, 2021 11:05
@crazy-max
Copy link
Member

crazy-max commented Jul 29, 2021

I think docker/buildx#686 might be important.

@thaJeztah
Copy link
Member Author

thaJeztah commented Jul 29, 2021

I think docker/buildx#686 might be important.

Ah, right, makes sense.

I think I have most other PRs merged for 20.10.8; do you know if buildx v0.6.1 should be released soon? (in time to make it for 20.10.8 if we want to release that on Monday/Tuesday?)

crazy-max
crazy-max reviewed Jul 30, 2021
View reviewed changes
plugins/buildx.installer Outdated
GOPATH=$(go env GOPATH)
REPO=https://${PKG}.git
: "${BUILDX_COMMIT=v0.5.1}"
: "${BUILDX_COMMIT=v0.6.0}"
Copy link
Member

@crazy-max crazy-max Jul 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
: "${BUILDX_COMMIT=v0.6.0}"
: "${BUILDX_COMMIT=v0.6.1}"

Ref #565

Copy link
Member Author

@thaJeztah thaJeztah Jul 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll cherry pick the other commit as well 👍

@crazy-max @thaJeztah
update buildx to v0.6.1
391f1fd 
release notes: https://github.com/docker/buildx/releases/tag/v0.6.1

Signed-off-by: CrazyMax <[email protected]>
(cherry picked from commit 2a17e90)
Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah changed the title [20.10 backport] update buildx to v0.6.0 [20.10 backport] update buildx to v0.6.1 Jul 30, 2021
@thaJeztah
Copy link
Member Author

thaJeztah commented Jul 30, 2021

@crazy-max updated to include #565; PTAL

@thaJeztah
Copy link
Member Author

thaJeztah commented Jul 30, 2021

Interesting error in Jenkins (not related to this change, but posting for discoverability);

docker run --rm -v $(pwd):/workspace busybox chown -R "$(id -u):$(id -g)" /workspace
+ pwd
+ id -u
+ id -g
+ docker run --rm -v /home/ubuntu/workspace/docker-ce-packaging_PR-562:/workspace busybox chown -R 1000:1000 /workspace
Unable to find image 'busybox:latest' locally
latest: Pulling from library/busybox
b71f96345d44: Pulling fs layer
b71f96345d44: Verifying Checksum
b71f96345d44: Download complete
b71f96345d44: Pull complete
Digest: sha256:0f354ec1728d9ff32edcd7d1b8bbdfc798277ad36120dc3dc683be44524c8b60
Status: Downloaded newer image for busybox:latest
docker: Error response from daemon: OCI runtime create failed: container_linux.go:380: starting container process caused: process_linux.go:545: container init caused: process_linux.go:508: setting cgroup config for procHooks process caused: error while setting unit properties: Unit docker-02f6e99b878a98640552ea113c1b3a23a518d67058a40945c18bd0bd0dc85eb8.scope not found.: unknown.

@thaJeztah
Copy link
Member Author

thaJeztah commented Jul 30, 2021

Bringing this one in, and will do a test-build to staging

@thaJeztah thaJeztah merged commit 5a28c77 into docker:20.10 Jul 30, 2021
@thaJeztah thaJeztah deleted the 20.10_backport_bump_buildx_0.6 branch July 30, 2021 19:07
archlinux-github pushed a commit to archlinux/svntogit-community that referenced this pull request Aug 4, 2021
@seblu
upgpkg: docker 1:20.10.8-1
2046e8f 
- Bump to docker moby 20.10.8
- Drop deprecated and archived app plugin (docker/docker-ce-packaging#548)
- Upgrade buildx to 0.6.1 (docker/docker-ce-packaging#562)

git-svn-id: file:///srv/repos/svn-community/svn@993629 9fca08f4-af9d-4005-b8df-a31f2cc04f65
archlinux-github pushed a commit to archlinux/svntogit-community that referenced this pull request Aug 4, 2021
@seblu
upgpkg: docker 1:20.10.8-1
cbcdb38 
- Bump to docker moby 20.10.8
- Drop deprecated and archived app plugin (docker/docker-ce-packaging#548)
- Upgrade buildx to 0.6.1 (docker/docker-ce-packaging#562)



git-svn-id: file:///srv/repos/svn-community/svn@993629 9fca08f4-af9d-4005-b8df-a31f2cc04f65
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@crazy-max crazy-max crazy-max left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@thaJeztah @crazy-max