Skip to content

[DNM] trigger CI with containerd v1.5.0-rc.3 + runc rc94-pre#42308

Closed
AkihiroSuda wants to merge 3 commits intomoby:masterfrom
AkihiroSuda:containerd15
Closed

[DNM] trigger CI with containerd v1.5.0-rc.3 + runc rc94-pre#42308
AkihiroSuda wants to merge 3 commits intomoby:masterfrom
AkihiroSuda:containerd15

Conversation

@AkihiroSuda
Copy link
Copy Markdown
Member

Triggering CI with containerd v1.5.0-rc.2 for ensuring that containerd 1.5 is compatible with the current Moby.

@AkihiroSuda AkihiroSuda changed the title [DNM] trigger CI with containerd v1.5.0-rc.2 [DNM] trigger CI with containerd v1.5.0-rc.3 + rc94-pre May 1, 2021
@AkihiroSuda AkihiroSuda changed the title [DNM] trigger CI with containerd v1.5.0-rc.3 + rc94-pre [DNM] trigger CI with containerd v1.5.0-rc.3 + runc rc94-pre May 1, 2021
@AkihiroSuda

This comment has been minimized.

Copy link
Copy Markdown
Member

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;

Destination: getSecretTargetPath(r),

And use a function like getSecretTargetPath();

moby/container/container.go

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 (?))

containerSecretMountPath = `C:\ProgramData\Docker\secrets`

containerSecretMountPath = "/run/secrets"

Copy link
Copy Markdown
Member

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 <akihiro.suda.cz@hco.ntt.co.jp>
Needed for runc >= 1.0.0-rc94.

See runc issue 2928.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@AkihiroSuda
Copy link
Copy Markdown
Member Author

Carried as #42369

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.

2 participants