Skip to content

vendor: update docker/cli, docker/docker, containerd#1300

Closed
thaJeztah wants to merge 4 commits intodocker:masterfrom
thaJeztah:update_engine
Closed

vendor: update docker/cli, docker/docker, containerd#1300
thaJeztah wants to merge 4 commits intodocker:masterfrom
thaJeztah:update_engine

Conversation

@thaJeztah
Copy link
Member

vendor: github.com/containerd/containerd v1.6.8

Relevant changes:

  • Fix WWW-Authenticate parsing
    • fixes "Failed to parse Www-Authenticate if auth-param has empty value"

full diff: containerd/containerd@v1.6.6...v1.6.8

vendor: github.com/docker/go-units v0.5.0

full diff: docker/go-units@v0.4.0...v0.5.0

vendor: docker v20.10.3-0.20220831131523-b5a0d7a188ac (22.06 branch)

full diff: moby/moby@a60b458...b5a0d7a

vendor: docker/cli v20.10.3-0.20220831164732-67cc8b1fd88a (master / 22.06-dev)

full diff: docker/cli@418ca3b...67cc8b1

Copy link
Member

@tonistiigi tonistiigi left a comment

Choose a reason for hiding this comment

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

We usually update these dependencies through buildkit(especially contained that doesn't have almost any dependency for buildx) so they versions are not different for same libraries.

@thaJeztah
Copy link
Member Author

thaJeztah commented Sep 1, 2022

Yes, was working on a branch for BuildKit as well; just opened a PR moby/buildkit#3075

Overall, it may become a bit more complicated, as;

  • buildx depends on docker/cli and buildkit
  • buildkit depends on moby (22.06 branch)
  • moby 22.06 branch depends on buildkit (v0.10)
  • docker/cli depends on moby (22.06 branch) (and buildkit v0.10)

Which means there's a dependency on both BuildKit master and BuildKit v0.10, so we must be sure that BuildKit master is backward compatible with BuildKit v0.10. Currently, moby and docker/cli don't have a go.mod, so we can still be somewhat flexible, but once they do, go modules will enforce these versions (or overrides are needed).

Relevant changes:

- Fix WWW-Authenticate parsing
    - fixes "Failed to parse Www-Authenticate if auth-param has empty value"

full diff: containerd/containerd@v1.6.6...v1.6.8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: docker/go-units@v0.4.0...v0.5.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: moby/moby@a60b458...b5a0d7a

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
…2.06-dev)

full diff: docker/cli@418ca3b...67cc8b1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
github.com/compose-spec/compose-go v1.5.0
github.com/containerd/console v1.0.3
github.com/containerd/containerd v1.6.6
github.com/containerd/containerd v1.6.8
Copy link
Collaborator

Choose a reason for hiding this comment

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

Now v1.6.10

@crazy-max
Copy link
Member

Done in #1420 (36e663e)

@crazy-max crazy-max closed this Nov 29, 2022
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.

4 participants