tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-22 13:14:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #805 from docker/run--env-file

Browse Source 
Replace `docker run —envFile` with `docker run —env-file`
This commit is contained in:
Guillaume Tardif 2020-10-16 21:26:35 +02:00 committed by GitHub
commit f5f87e342a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/cmd/run/run.go
View File

@ -56,7 +56,7 @@ func Command(contextType string) *cobra.Command {
cmd.Flags().Float64Var(&opts.Cpus, "cpus", 1., "Number of CPUs") cmd.Flags().Float64Var(&opts.Cpus, "cpus", 1., "Number of CPUs")
cmd.Flags().VarP(&opts.Memory, "memory", "m", "Memory limit") cmd.Flags().VarP(&opts.Memory, "memory", "m", "Memory limit")
cmd.Flags().StringArrayVarP(&opts.Environment, "env", "e", []string{}, "Set environment variables") 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") cmd.Flags().StringVarP(&opts.RestartPolicyCondition, "restart", "", containers.RestartPolicyNone, "Restart policy to apply when a container exits")
if contextType == store.AciContextType { if contextType == store.AciContextType {

22
cli/cmd/run/testdata/run-help.golden vendored
View File

@ -4,14 +4,14 @@ Usage:
run [flags] run [flags]
Flags: Flags:
--cpus float Number of CPUs (default 1) --cpus float Number of CPUs (default 1)
-d, --detach Run container in background and print container ID -d, --detach Run container in background and print container ID
--domainname string Container NIS domain name --domainname string Container NIS domain name
-e, --env stringArray Set environment variables -e, --env stringArray Set environment variables
--envFile stringArray Path to environment files to be translated as environment variables --env-file stringArray Path to environment files to be translated as environment variables
-l, --label stringArray Set meta data on a container -l, --label stringArray Set meta data on a container
-m, --memory bytes Memory limit -m, --memory bytes Memory limit
--name string Assign a name to the container --name string Assign a name to the container
-p, --publish stringArray Publish a container's port(s). [HOST_PORT:]CONTAINER_PORT -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") --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] -v, --volume stringArray Volume. Ex: storageaccount/my_share[:/absolute/path/to/target][:ro]

2
docs/aci-container-features.md
View File

@ -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. | -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). | --domainname | ✓ | See [Exposing ports](#exposing-ports).
| --e, --env | ✓ | Sets environment variable. | --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. | -l, --label | x | Unsupported in Docker ACI integration, due to limitations of ACI Tags.
| -m, --memory | ✓ | See [Container Resources](#container-resources). | -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. | --name | ✓ | Provide a name for the container. Name must be unique withing the ACI resource group. a name is generated by default.