enhancement restart policy#999
Merged
AkihiroSuda merged 1 commit intocontainerd:masterfrom May 5, 2022
Merged
Conversation
7c75527 to
1db71b3
Compare
junnplus
commented
Apr 21, 2022
8b42a2f to
9a2e964
Compare
AkihiroSuda
reviewed
Apr 25, 2022
cbe291d to
e4ae78f
Compare
fahedouch
reviewed
Apr 29, 2022
9aada81 to
f402e05
Compare
AkihiroSuda
reviewed
May 5, 2022
Member
|
Thanks, the code looks good but go.mod seems to have unneeded changes accidentally (?) |
Signed-off-by: Ye Sijun <[email protected]>
AkihiroSuda
reviewed
May 5, 2022
| github.com/containerd/continuity v0.3.0 | ||
| github.com/containerd/go-cni v1.1.5 | ||
| github.com/containerd/imgcrypt v1.1.4 | ||
| github.com/containerd/imgcrypt v1.1.5-0.20220421044638-8ba028dca028 |
Member
There was a problem hiding this comment.
Why do we need updating imgcrypt and typeurl?
Member
Author
There was a problem hiding this comment.
I'm not sure, I just replaced containerd and go mod tidy.
AkihiroSuda
reviewed
May 5, 2022
| // Temporary fork for avoiding importing patent-protected code: https://github.com/hashicorp/golang-lru/issues/73 | ||
| replace github.com/hashicorp/golang-lru => github.com/ktock/golang-lru v0.5.5-0.20211029085301-ec551be6f75c | ||
|
|
||
| replace github.com/containerd/containerd => github.com/containerd/containerd v1.6.1-0.20220428184543-bb8b134a1797 |
Member
There was a problem hiding this comment.
Why do we need replace() ? Can we just specify this revision in require() ?
Member
Author
There was a problem hiding this comment.
I tried it but go get fails :(
go get github.com/containerd/containerd@main
go: github.com/containerd/containerd@main (v1.6.1-0.20220504173539-885468815ef7) requires github.com/containerd/[email protected], not github.com/containerd/containerd@main (v1.6.1-0.20220504173539-885468815ef7)
AkihiroSuda
approved these changes
May 5, 2022
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Ye Sijun [email protected]
Fixes: #945