Skip to content

vendor: update buildkit with typed errors support#389

Merged
thaJeztah merged 2 commits intodocker:masterfrom
tonistiigi:buildkit-update-20200913
Sep 17, 2020
Merged

vendor: update buildkit with typed errors support#389
thaJeztah merged 2 commits intodocker:masterfrom
tonistiigi:buildkit-update-20200913

Conversation

@tonistiigi
Copy link
Copy Markdown
Member

Signed-off-by: Tonis Tiigi tonistiigi@gmail.com

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@tonistiigi
Copy link
Copy Markdown
Member Author

Needed to downgrade sys/unix with replace rule because the new one (that cli requires through moby/term) does not build with moby/moby and containerd/console. golang/sys@6fcdbc0 Moby isn't big issue as could be upgraded/removed but containerd package looks like a chunk of work (especially because on first look package itself does not seem to be implemented correctly). FYI @thaJeztah

@thaJeztah
Copy link
Copy Markdown
Member

especially because on first look package itself does not seem to be implemented correctly

You mean the containerd/console package isn't implemented correctly, or golang/x/sys ?

@tonistiigi
Copy link
Copy Markdown
Member Author

@thaJeztah containerd/console

containerd and moby packages do not build in darwin anymore

golang/sys@6fcdbc0

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
@tonistiigi tonistiigi force-pushed the buildkit-update-20200913 branch from ed9eb75 to 3c94621 Compare September 15, 2020 03:50
@thaJeztah
Copy link
Copy Markdown
Member

@tonistiigi thanks! Opened containerd/console#39 for discussing

@thaJeztah
Copy link
Copy Markdown
Member

containerd/console#40 was opened to fix the build on macOS

@tonistiigi
Copy link
Copy Markdown
Member Author

tonistiigi commented Sep 16, 2020

@thaJeztah Thanks. Still would like to get this merged as is. Updates should be first vendored into buildkit and takes time when they reach here.

@thaJeztah
Copy link
Copy Markdown
Member

Ah, sorry, yes of course; just commented to update status on that issue 😅

Copy link
Copy Markdown
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah thaJeztah merged commit 92fb995 into docker:master Sep 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants