From 85c94a2f7f5a226483f50d44c3082a16b4049575 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Fri, 16 Oct 2020 18:03:47 +0200 Subject: [PATCH] =?UTF-8?q?Replace=20`docker=20run=20=E2=80=94envFile`=20w?= =?UTF-8?q?ith=20`docker=20run=20=E2=80=94env-file`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Guillaume Tardif --- cli/cmd/run/run.go | 2 +- cli/cmd/run/testdata/run-help.golden | 22 +++++++++++----------- docs/aci-container-features.md | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/cli/cmd/run/run.go b/cli/cmd/run/run.go index e10884756..24f415ce7 100644 --- a/cli/cmd/run/run.go +++ b/cli/cmd/run/run.go @@ -56,7 +56,7 @@ func Command(contextType string) *cobra.Command { cmd.Flags().Float64Var(&opts.Cpus, "cpus", 1., "Number of CPUs") cmd.Flags().VarP(&opts.Memory, "memory", "m", "Memory limit") cmd.Flags().StringArrayVarP(&opts.Environment, "env", "e", []string{}, "Set environment variables") - cmd.Flags().StringArrayVar(&opts.EnvironmentFiles, "envFile", []string{}, "Path to environment files to be translated as environment variables") + cmd.Flags().StringArrayVar(&opts.EnvironmentFiles, "env-file", []string{}, "Path to environment files to be translated as environment variables") cmd.Flags().StringVarP(&opts.RestartPolicyCondition, "restart", "", containers.RestartPolicyNone, "Restart policy to apply when a container exits") if contextType == store.AciContextType { diff --git a/cli/cmd/run/testdata/run-help.golden b/cli/cmd/run/testdata/run-help.golden index 71692ccdb..642976fd9 100644 --- a/cli/cmd/run/testdata/run-help.golden +++ b/cli/cmd/run/testdata/run-help.golden @@ -4,14 +4,14 @@ Usage: run [flags] Flags: - --cpus float Number of CPUs (default 1) - -d, --detach Run container in background and print container ID - --domainname string Container NIS domain name - -e, --env stringArray Set environment variables - --envFile stringArray Path to environment files to be translated as environment variables - -l, --label stringArray Set meta data on a container - -m, --memory bytes Memory limit - --name string Assign a name to the container - -p, --publish stringArray Publish a container's port(s). [HOST_PORT:]CONTAINER_PORT - --restart string Restart policy to apply when a container exits (default "none") - -v, --volume stringArray Volume. Ex: storageaccount/my_share[:/absolute/path/to/target][:ro] + --cpus float Number of CPUs (default 1) + -d, --detach Run container in background and print container ID + --domainname string Container NIS domain name + -e, --env stringArray Set environment variables + --env-file stringArray Path to environment files to be translated as environment variables + -l, --label stringArray Set meta data on a container + -m, --memory bytes Memory limit + --name string Assign a name to the container + -p, --publish stringArray Publish a container's port(s). [HOST_PORT:]CONTAINER_PORT + --restart string Restart policy to apply when a container exits (default "none") + -v, --volume stringArray Volume. Ex: storageaccount/my_share[:/absolute/path/to/target][:ro] diff --git a/docs/aci-container-features.md b/docs/aci-container-features.md index 3f5688618..5d8927b8c 100644 --- a/docs/aci-container-features.md +++ b/docs/aci-container-features.md @@ -21,7 +21,7 @@ __Legend:__ | -d, --detach | ✓ | Detach from container logs when container starts. By default, the command line stays attached and follow container logs. | --domainname | ✓ | See [Exposing ports](#exposing-ports). | --e, --env | ✓ | Sets environment variable. -| --envFile | ✓ | Sets environment variable from and external file. +| --env-file | ✓ | Sets environment variable from and external file. | -l, --label | x | Unsupported in Docker ACI integration, due to limitations of ACI Tags. | -m, --memory | ✓ | See [Container Resources](#container-resources). | --name | ✓ | Provide a name for the container. Name must be unique withing the ACI resource group. a name is generated by default.