Browse code

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

Update documentation on the revert on env validation

moxiegirl authored on 2015/10/06 07:27:45
Showing 1 changed files
... ...
@@ -216,7 +216,8 @@ An example of a file passed with `--env-file`
216 216
     _TEST_BAR=FOO
217 217
     TEST_APP_42=magic
218 218
     helloWorld=true
219
-    # 123qwe=bar <- is not valid
219
+    123qwe=bar
220
+    org.spring.config=something
220 221
 
221 222
     # pass through this variable from the caller
222 223
     TEST_PASSTHROUGH
... ...
@@ -231,6 +232,8 @@ An example of a file passed with `--env-file`
231 231
     helloWorld=true
232 232
     TEST_PASSTHROUGH=howdy
233 233
     HOME=/root
234
+    123qwe=bar
235
+    org.spring.config=something
234 236
 
235 237
     $ docker run --env-file ./env.list busybox env
236 238
     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`
243 243
     helloWorld=true
244 244
     TEST_PASSTHROUGH=
245 245
     HOME=/root
246
-
247
-> **Note**: Environment variables names must consist solely of letters, numbers,
248
-> and underscores - and cannot start with a number.
246
+    123qwe=bar
247
+    org.spring.config=something
249 248
 
250 249
 A label is a a `key=value` pair that applies metadata to a container. To label a container with two labels:
251 250