opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-10-19 04:03:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25681 from Honny1/fix-container-clone-with-hc

Browse Source 
Fix container clone with configured Healthcheck
This commit is contained in:
openshift-merge-bot[bot]
2025-03-26 11:38:14 +00:00
committed by GitHub
parent 8d693d60dc f94d613556
commit d4cfceeda5
3 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/domain/infra/abi/containers.go
View File

@ -1733,6 +1733,11 @@ func (ic *ContainerEngine) ContainerClone(ctx context.Context, ctrCloneOpts enti
}
}
ctrCloneOpts.CreateOpts.HealthOnFailure = spec.HealthCheckOnFailureAction.String()
ctrCloneOpts.CreateOpts.HealthLogDestination = spec.HealthLogDestination
ctrCloneOpts.CreateOpts.HealthMaxLogCount = spec.HealthMaxLogCount
ctrCloneOpts.CreateOpts.HealthMaxLogSize = spec.HealthMaxLogSize
err = specgenutil.FillOutSpecGen(spec, &ctrCloneOpts.CreateOpts, []string{})
if err != nil {
return nil, err

4
pkg/specgen/generate/container.go
View File

@ -462,6 +462,10 @@ func ConfigToSpec(rt *libpod.Runtime, specg *specgen.SpecGenerator, containerID
specg.HealthMaxLogSize = define.DefaultHealthMaxLogSize
}
specg.HealthConfig = conf.HealthCheckConfig
specg.StartupHealthConfig = conf.StartupHealthCheckConfig
specg.HealthCheckOnFailureAction = conf.HealthCheckOnFailureAction
specg.IDMappings = &conf.IDMappings
specg.ContainerCreateCommand = conf.CreateCommand
if len(specg.Rootfs) == 0 {