diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-06 23:36:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-06 23:36:09 +0100 |
| commit | 3ac1219cbcfe8ccd83ed7b73b92e1d6f13abf550 (patch) | |
| tree | 4fe890289a727982ddf77569ac1d1db45a8068c8 /cmd/podman/common/create_opts.go | |
| parent | d62752819214ee7f910e25d368d427fbcac74b17 (diff) | |
| parent | 2a524fcaec4e6f66461d7cdda1bb73ed7c50f026 (diff) | |
| download | podman-3ac1219cbcfe8ccd83ed7b73b92e1d6f13abf550.tar.gz podman-3ac1219cbcfe8ccd83ed7b73b92e1d6f13abf550.tar.bz2 podman-3ac1219cbcfe8ccd83ed7b73b92e1d6f13abf550.zip | |
Merge pull request #12614 from baude/bz2028408
fix healthcheck timeouts and ut8 coercion
Diffstat (limited to 'cmd/podman/common/create_opts.go')
| -rw-r--r-- | cmd/podman/common/create_opts.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index f2335a2be..297188a45 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -11,6 +11,7 @@ import ( "github.com/containers/common/pkg/cgroups" "github.com/containers/common/pkg/config" "github.com/containers/podman/v3/cmd/podman/registry" + "github.com/containers/podman/v3/libpod/define" "github.com/containers/podman/v3/libpod/network/types" "github.com/containers/podman/v3/pkg/api/handlers" "github.com/containers/podman/v3/pkg/domain/entities" @@ -304,10 +305,10 @@ func ContainerCreateToContainerCLIOpts(cc handlers.CreateContainerConfig, rtc *c VolumesFrom: cc.HostConfig.VolumesFrom, Workdir: cc.Config.WorkingDir, Net: &netInfo, - HealthInterval: DefaultHealthCheckInterval, - HealthRetries: DefaultHealthCheckRetries, - HealthTimeout: DefaultHealthCheckTimeout, - HealthStartPeriod: DefaultHealthCheckStartPeriod, + HealthInterval: define.DefaultHealthCheckInterval, + HealthRetries: define.DefaultHealthCheckRetries, + HealthTimeout: define.DefaultHealthCheckTimeout, + HealthStartPeriod: define.DefaultHealthCheckStartPeriod, } if !rootless.IsRootless() { var ulimits []string |