diff options
| author | Peter Hunt <pehunt@redhat.com> | 2019-06-19 10:04:06 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2019-11-11 15:58:17 -0500 |
| commit | e01ca4912e10403aaa20a0d62d5b0a35dd2826f6 (patch) | |
| tree | 64cdc2b556d13278d57938b3c6efc9d81c126e1f | |
| parent | 33c3f1849b6e2e644a554a8f38266e51df7d5258 (diff) | |
| download | podman-e01ca4912e10403aaa20a0d62d5b0a35dd2826f6.tar.gz podman-e01ca4912e10403aaa20a0d62d5b0a35dd2826f6.tar.bz2 podman-e01ca4912e10403aaa20a0d62d5b0a35dd2826f6.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>
| -rw-r--r-- | libpod/oci_linux.go | 4 |
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())) |