opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-17 15:18:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26116 from inknos/compat-post-containers-create-cgroupsnsmode

Browse Source 
compat: Add CgroupnsMode to POST /containers/create
This commit is contained in:
openshift-merge-bot[bot]
2025-05-15 18:20:38 +00:00
committed by GitHub
parent 3bf3d869b6 b82f2962c3
commit 5fef6b714d
3 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/api/handlers/compat/containers.go
View File

@ -507,6 +507,14 @@ func LibpodToContainerJSON(l *libpod.Container, sz bool) (*container.InspectResp
}
sort.Strings(hc.Binds)
// Map CgroupMode to CgroupnsMode for Docker API compatibility
switch inspect.HostConfig.CgroupMode {
case "private":
hc.CgroupnsMode = container.CgroupnsModePrivate
case "host":
hc.CgroupnsMode = container.CgroupnsModeHost
}
// k8s-file == json-file
if hc.LogConfig.Type == define.KubernetesLogging {
hc.LogConfig.Type = define.JSONLogging

1
pkg/api/handlers/compat/containers_create.go
View File

@ -474,6 +474,7 @@ func cliOpts(cc handlers.CreateContainerConfig, rtc *config.Config) (*entities.C
User: cc.Config.User,
UserNS: string(cc.HostConfig.UsernsMode),
UTS: string(cc.HostConfig.UTSMode),
CgroupNS: string(cc.HostConfig.CgroupnsMode),
Mount: mounts,
VolumesFrom: cc.HostConfig.VolumesFrom,
Workdir: cc.Config.WorkingDir,