Skip to content
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

vendor: assorted vendor updates for containerd 1.7.0 #45158

Merged
merged 8 commits into from Mar 16, 2023

Conversation

thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Mar 14, 2023

Most (all?) of these are probably safe to take, or even backport to 23.0 if we want to.

vendor: golang.org/x/sys v0.6.0

full diff: golang/sys@v0.5.0...v0.6.0

vendor: github.com/imdario/mergo v0.3.13

full diff: darccio/mergo@v0.3.12...v0.3.13

vendor: github.com/opencontainers/selinux v1.11.0

full diff: opencontainers/selinux@v1.10.2...v1.11.0

vendor: github.com/coreos/go-systemd/v22 v22.5.0

full diff: coreos/go-systemd@v22.4.0...v22.5.0

vendor: github.com/godbus/dbus/v5 v5.1.0

full diff: godbus/dbus@v5.0.6...v5.1.0

vendor: github.com/klauspost/compress v1.16.3

full diff: klauspost/compress@v1.15.12...v1.16.3

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

no changes in vendored files

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

vendor: github.com/opencontainers/runtime-spec v1.1.0-rc.1

full diff: opencontainers/runtime-spec@1c3f411...v1.1.0-rc.1

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@thaJeztah thaJeztah added this to the v-next milestone Mar 14, 2023
@thaJeztah
Copy link
Member Author

@vvoland @corhere ptal 🤗

Copy link
Contributor

@corhere corhere left a comment

Choose a reason for hiding this comment

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

One change caught my eye which I think is worth calling out: godbus/dbus@230c6f2

The static_build build tag no longer has any meaning to the dbus module, though I don't believe we need to take any action. Our build scripts set both osusergo and static_build already, and it doesn't look like we can get rid of the static_build tag as it is still used in build constraints in a few of our own packages.

vendor.mod Show resolved Hide resolved
full diff: golang/sys@v0.5.0...v0.6.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: darccio/mergo@v0.3.12...v0.3.13

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: opencontainers/selinux@v1.10.2...v1.11.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: coreos/go-systemd@v22.4.0...v22.5.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: godbus/dbus@v5.0.6...v5.1.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
full diff: klauspost/compress@v1.15.12...v1.16.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
no changes in vendored files

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

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah
Copy link
Member Author

One change caught my eye which I think is worth calling out: godbus/dbus@230c6f2

The static_build build tag no longer has any meaning to the dbus module, though I don't believe we need to take any action. Our build scripts set both osusergo and static_build already, and it doesn't look like we can get rid of the static_build tag as it is still used in build constraints in a few of our own packages.

Yes, I noticed that change as well

@thaJeztah thaJeztah merged commit 90e82a2 into moby:master Mar 16, 2023
86 checks passed
@thaJeztah thaJeztah deleted the containerd_1.7_deps branch March 16, 2023 00: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.

None yet

3 participants