Переглянути джерело

--env-file instead of --envfile

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Vincent Batts 11 роки тому
батько
коміт
586e6c5eb9
2 змінених файлів з 2 додано та 2 видалено
  1. 1 1
      docs/sources/reference/commandline/cli.rst
  2. 1 1
      runconfig/parse.go

+ 1 - 1
docs/sources/reference/commandline/cli.rst

@@ -1152,7 +1152,7 @@ image is removed.
       --cidfile="": Write the container ID to the file
       --cidfile="": Write the container ID to the file
       -d, --detach=false: Detached mode: Run container in the background, print new container id
       -d, --detach=false: Detached mode: Run container in the background, print new container id
       -e, --env=[]: Set environment variables
       -e, --env=[]: Set environment variables
-      --envfile="": Read in a line delimited file of ENV variables
+      --env-file="": Read in a line delimited file of ENV variables
       -h, --hostname="": Container host name
       -h, --hostname="": Container host name
       -i, --interactive=false: Keep stdin open even if not attached
       -i, --interactive=false: Keep stdin open even if not attached
       --privileged=false: Give extended privileges to this container
       --privileged=false: Give extended privileges to this container

+ 1 - 1
runconfig/parse.go

@@ -68,7 +68,7 @@ func parseRun(cmd *flag.FlagSet, args []string, sysInfo *sysinfo.SysInfo) (*Conf
 		flWorkingDir      = cmd.String([]string{"w", "-workdir"}, "", "Working directory inside the container")
 		flWorkingDir      = cmd.String([]string{"w", "-workdir"}, "", "Working directory inside the container")
 		flCpuShares       = cmd.Int64([]string{"c", "-cpu-shares"}, 0, "CPU shares (relative weight)")
 		flCpuShares       = cmd.Int64([]string{"c", "-cpu-shares"}, 0, "CPU shares (relative weight)")
 		flLabelOptions    = cmd.String([]string{"Z", "-label"}, "", "Options to pass to underlying labeling system")
 		flLabelOptions    = cmd.String([]string{"Z", "-label"}, "", "Options to pass to underlying labeling system")
-		flEnvFile         = cmd.String([]string{"#envfile", "-envfile"}, "", "Read in a line delimited file of ENV variables")
+		flEnvFile         = cmd.String([]string{"#env-file", "-env-file"}, "", "Read in a line delimited file of ENV variables")
 
 
 		// For documentation purpose
 		// For documentation purpose
 		_ = cmd.Bool([]string{"#sig-proxy", "-sig-proxy"}, true, "Proxify all received signal to the process (even in non-tty mode)")
 		_ = cmd.Bool([]string{"#sig-proxy", "-sig-proxy"}, true, "Proxify all received signal to the process (even in non-tty mode)")