Browse code
--env-file instead of --envfile
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Vincent Batts authored on 2014/02/19 05:41:28Showing 2 changed files
| ... | ... |
@@ -1152,7 +1152,7 @@ image is removed. |
| 1152 | 1152 |
--cidfile="": Write the container ID to the file |
| 1153 | 1153 |
-d, --detach=false: Detached mode: Run container in the background, print new container id |
| 1154 | 1154 |
-e, --env=[]: Set environment variables |
| 1155 |
- --envfile="": Read in a line delimited file of ENV variables |
|
| 1155 |
+ --env-file="": Read in a line delimited file of ENV variables |
|
| 1156 | 1156 |
-h, --hostname="": Container host name |
| 1157 | 1157 |
-i, --interactive=false: Keep stdin open even if not attached |
| 1158 | 1158 |
--privileged=false: Give extended privileges to this container |
| ... | ... |
@@ -68,7 +68,7 @@ func parseRun(cmd *flag.FlagSet, args []string, sysInfo *sysinfo.SysInfo) (*Conf |
| 68 | 68 |
flWorkingDir = cmd.String([]string{"w", "-workdir"}, "", "Working directory inside the container")
|
| 69 | 69 |
flCpuShares = cmd.Int64([]string{"c", "-cpu-shares"}, 0, "CPU shares (relative weight)")
|
| 70 | 70 |
flLabelOptions = cmd.String([]string{"Z", "-label"}, "", "Options to pass to underlying labeling system")
|
| 71 |
- flEnvFile = cmd.String([]string{"#envfile", "-envfile"}, "", "Read in a line delimited file of ENV variables")
|
|
| 71 |
+ flEnvFile = cmd.String([]string{"#env-file", "-env-file"}, "", "Read in a line delimited file of ENV variables")
|
|
| 72 | 72 |
|
| 73 | 73 |
// For documentation purpose |
| 74 | 74 |
_ = cmd.Bool([]string{"#sig-proxy", "-sig-proxy"}, true, "Proxify all received signal to the process (even in non-tty mode)")
|