From f43046745386d8cd15e010a6ade65619ad12b383 Mon Sep 17 00:00:00 2001 From: baude Date: Tue, 19 Jan 2021 15:51:01 -0600 Subject: 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 --- cmd/podman/common/create_opts.go | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'cmd/podman/common/create_opts.go') diff --git a/cmd/podman/common/create_opts.go b/cmd/podman/common/create_opts.go index 9635f4135..f252618ce 100644 --- a/cmd/podman/common/create_opts.go +++ b/cmd/podman/common/create_opts.go @@ -517,3 +517,10 @@ func volumes() []string { } return nil } + +func logDriver() string { + if !registry.IsRemote() { + return containerConfig.Containers.LogDriver + } + return "" +} -- cgit v1.2.3-54-g00ecf