Sanitize docker labels when used as journald field names

projectatomic / docker

Docker - the open-source application container engine

http://www.docker.com

Apache License 2.0

81 stars 58 forks source link

Sanitize docker labels when used as journald field names #297

Closed nalind closed 6 years ago

nalind commented 6 years ago

Currently, we can add the contents of some container labels to logs by starting the daemon with --log-opt labels=io.kubernetes.pod.name,io.openshift.tags,vendor or the like, but the journal daemon rejects fields which don't match an expected format, so these values don't get recorded. This PR cherry-picks the upstream fix for this problem from https://github.com/moby/moby/pull/23725, where it was merged in time for 1.13.

rhatdan commented 6 years ago

LGTM

rhatdan commented 6 years ago

Can we get this for docker-1.13 as well?

nalind commented 6 years ago

This was merged into upstream in time for 1.13, so it's already fixed in our 1.13 branch.

rhatdan commented 6 years ago

Great. We are hoping to get rid of docker-1.12 ASAP.