diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-17 17:17:27 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-17 17:17:27 -0400 |
commit | 7b00e49f657305f233e4e29613821305bf4d2962 (patch) | |
tree | 8470c3a4a002f93514762f7fe2eb37cc0396d44b /libpod/define | |
parent | daabbc1a1e82b840a51b6d769cdf19cfda474144 (diff) | |
parent | 0e171b7b3327948f2e9e32d9e496736bd7a48009 (diff) | |
download | podman-7b00e49f657305f233e4e29613821305bf4d2962.tar.gz podman-7b00e49f657305f233e4e29613821305bf4d2962.tar.bz2 podman-7b00e49f657305f233e4e29613821305bf4d2962.zip |
Merge pull request #6560 from mheon/fix_exec_logdriver
Do not share container log driver for exec
Diffstat (limited to 'libpod/define')
-rw-r--r-- | libpod/define/config.go | 3 | ||||
-rw-r--r-- | libpod/define/errors.go | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libpod/define/config.go b/libpod/define/config.go index 5ca4da4af..900a363d8 100644 --- a/libpod/define/config.go +++ b/libpod/define/config.go @@ -72,3 +72,6 @@ const KubernetesLogging = "k8s-file" // JSONLogging is the string conmon expects when specifying to use the json logging format const JSONLogging = "json-file" + +// NoLogging is the string conmon expects when specifying to use no log driver whatsoever +const NoLogging = "none" diff --git a/libpod/define/errors.go b/libpod/define/errors.go index 083553b7e..e0c9811fe 100644 --- a/libpod/define/errors.go +++ b/libpod/define/errors.go @@ -79,6 +79,9 @@ var ( // ErrNoCgroups indicates that the container does not have its own // CGroup. ErrNoCgroups = errors.New("this container does not have a cgroup") + // ErrNoLogs indicates that this container is not creating a log so log + // operations cannot be performed on it + ErrNoLogs = errors.New("this container is not logging output") // ErrRootless indicates that the given command cannot but run without // root. |