Skip to content

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Nov 24, 2022

These all should be not too controversial, and we may consider including in v23.0.0 as well

vendor: github.com/opencontainers/runc v1.1.3

no changes in vendored code

full diff: opencontainers/runc@v1.1.2...v1.1.3

vendor: golang.org/x/net v0.2.0

  • http2/hpack: build static table with go generate

full diff: golang/net@v0.1.0...v0.2.0

vendor: golang.org/x/crypto v0.2.0

  • all: use math/bits.RotateLeft

full diff: golang/crypto@v0.1.0...v0.2.0

vendor: github.com/go-logr/logr v1.2.3

full diff: go-logr/logr@v1.2.2...v1.2.3

vendor: github.com/tonistiigi/fsutil v0.0.0-20221114235510-0127568185cf (removed see below)

full diff: tonistiigi/fsutil@9ed6126...0127568

vendor: github.com/prometheus/client_golang v1.14.0

full diff: prometheus/client_golang@v1.13.0...v1.14.0

@thaJeztah
Copy link
Member Author

ARGH.... can't update fsutil, because BuildKit is not compatible;

#36 42.90 # github.com/docker/docker/vendor/github.com/moby/buildkit/session/filesync
#36 42.90 vendor/github.com/moby/buildkit/session/filesync/filesync.go:112:20: cannot use dir.Map (variable of type func(string, *types.Stat) bool) as type fsutil.MapFunc in struct literal

@thaJeztah thaJeztah force-pushed the update_buildkit_deps1 branch from b815656 to e06664c Compare November 24, 2022 23:54
no changes in vendored code

full diff: opencontainers/runc@v1.1.2...v1.1.3

Signed-off-by: Sebastiaan van Stijn <[email protected]>
- http2/hpack: build static table with go generate

full diff: golang/net@v0.1.0...v0.2.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
- all: use math/bits.RotateLeft

full diff: golang/crypto@v0.1.0...v0.2.0

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah thaJeztah force-pushed the update_buildkit_deps1 branch from e06664c to dc52e08 Compare November 25, 2022 16:58
@thaJeztah
Copy link
Member Author

Rebased, and dropped one commit, which was taken care of in #44535

@thaJeztah
Copy link
Member Author

Let me get this one in for master at least

@thaJeztah thaJeztah merged commit 3910417 into moby:master Nov 26, 2022
@thaJeztah thaJeztah deleted the update_buildkit_deps1 branch November 26, 2022 13:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants