Merge pull request #16647 from vdemeester/revert-env-validation-docs

Update documentation on the revert on env validation
This commit is contained in:
moxiegirl 2015-10-05 15:27:45 -07:00
commit e1d3cb89f1
1 changed files with 6 additions and 4 deletions

View File

@ -216,7 +216,8 @@ An example of a file passed with `--env-file`
_TEST_BAR=FOO _TEST_BAR=FOO
TEST_APP_42=magic TEST_APP_42=magic
helloWorld=true helloWorld=true
# 123qwe=bar <- is not valid 123qwe=bar
org.spring.config=something
# pass through this variable from the caller # pass through this variable from the caller
TEST_PASSTHROUGH TEST_PASSTHROUGH
@ -231,6 +232,8 @@ An example of a file passed with `--env-file`
helloWorld=true helloWorld=true
TEST_PASSTHROUGH=howdy TEST_PASSTHROUGH=howdy
HOME=/root HOME=/root
123qwe=bar
org.spring.config=something
$ docker run --env-file ./env.list busybox env $ docker run --env-file ./env.list busybox env
PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
@ -243,9 +246,8 @@ An example of a file passed with `--env-file`
helloWorld=true helloWorld=true
TEST_PASSTHROUGH= TEST_PASSTHROUGH=
HOME=/root HOME=/root
123qwe=bar
> **Note**: Environment variables names must consist solely of letters, numbers, org.spring.config=something
> and underscores - and cannot start with a number.
A label is a a `key=value` pair that applies metadata to a container. To label a container with two labels: A label is a a `key=value` pair that applies metadata to a container. To label a container with two labels: