-
Notifications
You must be signed in to change notification settings - Fork 18.9k
[DNM] trigger CI with containerd v1.5.0-rc.3 + runc rc94-pre #42308
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
Conversation
This comment has been minimized.
This comment has been minimized.
c404a55 to
a15c979
Compare
container/container_unix.go
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you move this commit to a separate PR?
This should also probably take the same approach as is used for secrets;
moby/container/container_unix.go
Line 234 in 7b9275c
| Destination: getSecretTargetPath(r), |
And use a function like getSecretTargetPath();
Lines 711 to 717 in 7b9275c
| func getSecretTargetPath(r *swarmtypes.SecretReference) string { | |
| if filepath.IsAbs(r.File.Name) { | |
| return r.File.Name | |
| } | |
| return filepath.Join(containerSecretMountPath, r.File.Name) | |
| } |
Difference would be that containerSecretMountPath would be / on Linux, and C:/ on Windows (?))
moby/container/container_windows.go
Line 15 in 7b9275c
| containerSecretMountPath = `C:\ProgramData\Docker\secrets` |
moby/container/container_unix.go
Line 30 in 7b9275c
| containerSecretMountPath = "/run/secrets" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Opened #42370 with the above
Starting with runc v1.0.0-rc94, runc no longer supports KernelMemory. opencontainers/runc@52390d6 Signed-off-by: Akihiro Suda <[email protected]>
Needed for runc >= 1.0.0-rc94. See runc issue 2928. Signed-off-by: Akihiro Suda <[email protected]>
Signed-off-by: Akihiro Suda <[email protected]>
|
Carried as #42369 |
Triggering CI with containerd v1.5.0-rc.2 for ensuring that containerd 1.5 is compatible with the current Moby.