Skip to content

Conversation

@junnplus
Copy link
Member

@junnplus junnplus commented Apr 21, 2022

Signed-off-by: Ye Sijun [email protected]

Fixes: #945

@junnplus junnplus force-pushed the restart branch 3 times, most recently from 7c75527 to 1db71b3 Compare April 21, 2022 16:55
@junnplus junnplus added the enhancement New feature or request label Apr 21, 2022
@junnplus junnplus force-pushed the restart branch 2 times, most recently from 8b42a2f to 9a2e964 Compare April 22, 2022 04:37
@junnplus junnplus added this to the v0.20.0 (tentative) milestone Apr 22, 2022
@junnplus junnplus removed this from the v0.20.0 (tentative) milestone Apr 22, 2022
@junnplus junnplus marked this pull request as ready for review April 22, 2022 07:01
@fahedouch fahedouch self-requested a review April 24, 2022 18:12
@junnplus junnplus marked this pull request as draft April 27, 2022 11:18
@junnplus junnplus force-pushed the restart branch 2 times, most recently from cbe291d to e4ae78f Compare April 28, 2022 20:11
@junnplus junnplus marked this pull request as ready for review April 28, 2022 20:11
@junnplus junnplus force-pushed the restart branch 2 times, most recently from 9aada81 to f402e05 Compare April 29, 2022 09:50
@AkihiroSuda AkihiroSuda added this to the v0.20.0 (tentative) milestone May 5, 2022
@AkihiroSuda
Copy link
Member

Thanks, the code looks good but go.mod seems to have unneeded changes accidentally (?)

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
Copy link
Member

Choose a reason for hiding this comment

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

Why do we need updating imgcrypt and typeurl?

Copy link
Member Author

@junnplus junnplus May 5, 2022

Choose a reason for hiding this comment

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

I'm not sure, I just replaced containerd and go mod tidy.

// 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
Copy link
Member

Choose a reason for hiding this comment

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

Why do we need replace() ? Can we just specify this revision in require() ?

Copy link
Member Author

@junnplus junnplus May 5, 2022

Choose a reason for hiding this comment

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

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 AkihiroSuda merged commit d110fea into containerd:master May 5, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

we should support restart policy,like --restart=on-failure:5,but no we don't support

3 participants