diff options
| author | baude <bbaude@redhat.com> | 2021-01-19 15:51:01 -0600 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2021-01-21 10:22:36 -0600 |
| commit | 22d2caeeb1acadaced47bbacccec5f597e0d99f4 (patch) | |
| tree | 9796716c648619a4eea9395ed03a23ce11cf3fde /pkg/specgen | |
| parent | 4ecd2be083ec973855e623bdc1290492e18672ac (diff) | |
| download | podman-22d2caeeb1acadaced47bbacccec5f597e0d99f4.tar.gz podman-22d2caeeb1acadaced47bbacccec5f597e0d99f4.tar.bz2 podman-22d2caeeb1acadaced47bbacccec5f597e0d99f4.zip | |
Set log driver for compatability containers
when using the compatibility api to create containers, now reflect the
use of k8s-file as json-file so that clients, which are
unaware of k8s-file, can work. specifically, if the container is using
k8s-file as the log driver, we change the log type in container
inspection to json-file. These terms are used interchangably in other
locations in libpod/podman.
this fixes log messages in compose as well.
[NO TESTS NEEDED]
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/specgen')
| -rw-r--r-- | pkg/specgen/generate/container.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go index 2feb1d3b2..cc3f7928c 100644 --- a/pkg/specgen/generate/container.go +++ b/pkg/specgen/generate/container.go @@ -257,6 +257,14 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat } } + if s.LogConfiguration == nil { + s.LogConfiguration = &specgen.LogConfig{} + } + // set log-driver from common if not already set + if len(s.LogConfiguration.Driver) < 1 { + s.LogConfiguration.Driver = rtc.Containers.LogDriver + } + warnings, err := verifyContainerResources(s) if err != nil { return warnings, err |