summaryrefslogtreecommitdiff
path: root/libpod
diff options
context:
space:
mode:
authorPeter Hunt <pehunt@redhat.com>2019-06-19 10:04:06 -0400
committerPeter Hunt <pehunt@redhat.com>2019-06-19 10:13:41 -0400
commit11fbd20f5dcd095cf010c4c1903b8a8989db16bb (patch)
tree903cf49161992e8a5bab94dbc621be8f8f28ee60 /libpod
parent589b12dbc9e4efab3e98cda01b1e47f93e846586 (diff)
downloadpodman-11fbd20f5dcd095cf010c4c1903b8a8989db16bb.tar.gz
podman-11fbd20f5dcd095cf010c4c1903b8a8989db16bb.tar.bz2
podman-11fbd20f5dcd095cf010c4c1903b8a8989db16bb.zip
Spoof json-file logging support
For docker scripting compatibility, allow for json-file logging when creating args for conmon. That way, when json-file is supported, that case can be easily removed. Signed-off-by: Peter Hunt <pehunt@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r--libpod/oci_linux.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/libpod/oci_linux.go b/libpod/oci_linux.go
index 9bbefdb06..6e84c0759 100644
--- a/libpod/oci_linux.go
+++ b/libpod/oci_linux.go
@@ -246,7 +246,9 @@ func (r *OCIRuntime) createOCIContainer(ctr *Container, cgroupParent string, res
}
logDriver := KubernetesLogging
- if ctr.LogDriver() != "" {
+ if ctr.LogDriver() == JSONLogging {
+ logrus.Errorf("json-file logging specified but not supported. Choosing k8s-file logging instead")
+ } else if ctr.LogDriver() != "" {
logDriver = ctr.LogDriver()
}
args = append(args, "-l", fmt.Sprintf("%s:%s", logDriver, ctr.LogPath()))