Skip to content

go.mod: bump containerd/cgroups#828

Merged
katiewasnothere merged 1 commit intomicrosoft:masterfrom
kolyshkin:bump-cgroups
Jun 5, 2020
Merged

go.mod: bump containerd/cgroups#828
katiewasnothere merged 1 commit intomicrosoft:masterfrom
kolyshkin:bump-cgroups

Conversation

@kolyshkin
Copy link
Contributor

This is mostly to update dependencies.

@kolyshkin kolyshkin requested a review from a team as a code owner June 1, 2020 20:42
@msftclas
Copy link

msftclas commented Jun 1, 2020

CLA assistant check
All CLA requirements met.

@katiewasnothere
Copy link

Hi, unfortunately, this is a breaking change due to the api break mentioned here golang/go#34610. We would additionally need to update https://github.com/microsoft/go-winio and fix breaking changes there in order to take this.

@kolyshkin
Copy link
Contributor Author

Hi, unfortunately, this is a breaking change due to the api break mentioned here golang/go#34610. We would additionally need to update https://github.com/microsoft/go-winio and fix breaking changes there in order to take this.

Yeah, I see that :-(

Let's see how easy it is to fix this.

@kolyshkin
Copy link
Contributor Author

Hmm, unless I'm missing something big the fix was relatively easy; please see the second commit @katiewasnothere

@katiewasnothere
Copy link

I'm made a new PR for the necessary go-winio changes here microsoft/go-winio#172 fyi

@katiewasnothere
Copy link

This looks good to me. Could you squash the commits into one?

This is mostly to update dependencies.

Since we have updated x/sys/windows, make cmd/containerd-shim-runhcs-v1
use the new windows.SecurityDescriptorFromString(), removing the ugly
unsafe cast.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
@kolyshkin
Copy link
Contributor Author

This looks good to me. Could you squash the commits into one?

sure, done @katiewasnothere

Copy link

@katiewasnothere katiewasnothere left a comment

Choose a reason for hiding this comment

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

LGTM. Merging.

@katiewasnothere katiewasnothere merged commit 971423b into microsoft:master Jun 5, 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.

3 participants