diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-16 10:52:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 10:52:58 -0700 |
| commit | 5def21140038fc34cee9707d3069bf52adc24577 (patch) | |
| tree | 2582da76814b9eb636f11070b00a2dbb596754a5 /cmd/podman/shared/create.go | |
| parent | 8c4d4b58eee5e6d759199c36560af738aadc521d (diff) | |
| parent | ba430bfe5ef65d5aa5ffa1fef0087da76aafcc35 (diff) | |
| download | podman-5def21140038fc34cee9707d3069bf52adc24577.tar.gz podman-5def21140038fc34cee9707d3069bf52adc24577.tar.bz2 podman-5def21140038fc34cee9707d3069bf52adc24577.zip | |
Merge pull request #5842 from baude/v2bloat2
podman v2 remove bloat v2
Diffstat (limited to 'cmd/podman/shared/create.go')
| -rw-r--r-- | cmd/podman/shared/create.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go index 94b1e63dc..f8178a841 100644 --- a/cmd/podman/shared/create.go +++ b/cmd/podman/shared/create.go @@ -16,6 +16,7 @@ import ( "github.com/containers/image/v5/manifest" "github.com/containers/libpod/cmd/podman/shared/parse" "github.com/containers/libpod/libpod" + "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/libpod/image" ann "github.com/containers/libpod/pkg/annotations" "github.com/containers/libpod/pkg/autoupdate" @@ -715,7 +716,7 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod. // both memorySwappiness := c.Int64("memory-swappiness") - logDriver := libpod.KubernetesLogging + logDriver := define.KubernetesLogging if c.Changed("log-driver") { logDriver = c.String("log-driver") } |