diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-18 23:51:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-18 23:51:12 +0100 |
| commit | 319d3fba6d86dff7b19c5315bbe3ba0b67a97c81 (patch) | |
| tree | 0db6ef4e6ba9bcfd178017ea63d3c2989fbd6aa9 /pkg/domain | |
| parent | c26af00c4bf5aec458868b5afd44e7a88ddcf46d (diff) | |
| parent | 0dae50f1d3af16e625ca7e2f272fb2ce63682c83 (diff) | |
| download | podman-319d3fba6d86dff7b19c5315bbe3ba0b67a97c81.tar.gz podman-319d3fba6d86dff7b19c5315bbe3ba0b67a97c81.tar.bz2 podman-319d3fba6d86dff7b19c5315bbe3ba0b67a97c81.zip | |
Merge pull request #12354 from Luap99/exit-command
Do not store the exit command in container config
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/infra/abi/containers.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/domain/infra/abi/containers.go b/pkg/domain/infra/abi/containers.go index e04c7a38a..631eb3a43 100644 --- a/pkg/domain/infra/abi/containers.go +++ b/pkg/domain/infra/abi/containers.go @@ -29,6 +29,7 @@ import ( "github.com/containers/podman/v3/pkg/signal" "github.com/containers/podman/v3/pkg/specgen" "github.com/containers/podman/v3/pkg/specgen/generate" + "github.com/containers/podman/v3/pkg/specgenutil" "github.com/containers/podman/v3/pkg/util" "github.com/containers/storage" "github.com/pkg/errors" @@ -657,7 +658,7 @@ func makeExecConfig(options entities.ExecOptions, rt *libpod.Runtime) (*libpod.E return nil, errors.Wrapf(err, "error retrieving Libpod configuration to build exec exit command") } // TODO: Add some ability to toggle syslog - exitCommandArgs, err := generate.CreateExitCommandArgs(storageConfig, runtimeConfig, false, false, true) + exitCommandArgs, err := specgenutil.CreateExitCommandArgs(storageConfig, runtimeConfig, logrus.IsLevelEnabled(logrus.DebugLevel), false, true) if err != nil { return nil, errors.Wrapf(err, "error constructing exit command for exec session") } |