2 Commits

Author	SHA1	Message	Date
Tom Klingenberg	96c026eb30	import environment variables that are present ... previously docker did import environment variables if they were present but created them if they were not when it was asked via a --env-file cli option to import but not create them. fix is to only import the variable into the environment if it is present. additionally do not import variable names of zero-length (which are lines w/ a potential variable definition w/o a variable name). refs: - https://github.com/docker/for-linux/issues/284 Signed-off-by: Tom Klingenberg <tklingenberg@lastflood.net>	2018-07-02 07:37:12 +02:00
Vincent Demeester	2b17f4c8a8	Fix `--label-file` weird behavior ... `--label-file` has the exact same behavior as `--env-file`, meaning any placeholder (i.e. a simple key, no `=` sign, no value), it will get the value from the environment variable. For `--label-file` it should just add an empty label. Signed-off-by: Vincent Demeester <vincent@sbr.pm>	2018-01-29 11:08:54 -08:00