docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3034 from davemkirk/3025-registry-env-var 

Add ENGINE_REGISTRY_MIRROR env var support.
This commit is contained in:
Olivier Gambier 2016-02-11 11:05:34 -08:00
parent eae3a747b7 090c575c0d
commit 4262a8fde5
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
commands/create.go
View File

@ -59,9 +59,10 @@ var (
Value: &cli.StringSlice{}, Value: &cli.StringSlice{},
}, },
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "engine-registry-mirror", Name: "engine-registry-mirror",
Usage: "Specify registry mirrors to use", Usage: "Specify registry mirrors to use",
Value: &cli.StringSlice{}, Value: &cli.StringSlice{},
EnvVar: "ENGINE_REGISTRY_MIRROR",
}, },
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "engine-label", Name: "engine-label",

4
docs/reference/create.md
View File

@ -48,7 +48,7 @@ customize.
--engine-install-url "https://get.docker.com" Custom URL to use for engine installation [$MACHINE_DOCKER_INSTALL_URL] --engine-install-url "https://get.docker.com" Custom URL to use for engine installation [$MACHINE_DOCKER_INSTALL_URL]
--engine-opt [--engine-opt option --engine-opt option] Specify arbitrary flags to include with the created engine in the form flag=value --engine-opt [--engine-opt option --engine-opt option] Specify arbitrary flags to include with the created engine in the form flag=value
--engine-insecure-registry [--engine-insecure-registry option --engine-insecure-registry option] Specify insecure registries to allow with the created engine --engine-insecure-registry [--engine-insecure-registry option --engine-insecure-registry option] Specify insecure registries to allow with the created engine
--engine-registry-mirror [--engine-registry-mirror option --engine-registry-mirror option] Specify registry mirrors to use --engine-registry-mirror [--engine-registry-mirror option --engine-registry-mirror option] Specify registry mirrors to use [$ENGINE_REGISTRY_MIRROR]
--engine-label [--engine-label option --engine-label option] Specify labels for the created engine --engine-label [--engine-label option --engine-label option] Specify labels for the created engine
--engine-storage-driver Specify a storage driver to use with the engine --engine-storage-driver Specify a storage driver to use with the engine
--engine-env [--engine-env option --engine-env option] Specify environment variables to set in the engine --engine-env [--engine-env option --engine-env option] Specify environment variables to set in the engine
@ -84,7 +84,7 @@ invoking the `create` help text.
--engine-install-url "https://get.docker.com" Custom URL to use for engine installation [$MACHINE_DOCKER_INSTALL_URL] --engine-install-url "https://get.docker.com" Custom URL to use for engine installation [$MACHINE_DOCKER_INSTALL_URL]
--engine-label [--engine-label option --engine-label option] Specify labels for the created engine --engine-label [--engine-label option --engine-label option] Specify labels for the created engine
--engine-opt [--engine-opt option --engine-opt option] Specify arbitrary flags to include with the created engine in the form flag=value --engine-opt [--engine-opt option --engine-opt option] Specify arbitrary flags to include with the created engine in the form flag=value
--engine-registry-mirror [--engine-registry-mirror option --engine-registry-mirror option] Specify registry mirrors to use --engine-registry-mirror [--engine-registry-mirror option --engine-registry-mirror option] Specify registry mirrors to use [$ENGINE_REGISTRY_MIRROR]
--engine-storage-driver Specify a storage driver to use with the engine --engine-storage-driver Specify a storage driver to use with the engine
--swarm Configure Machine with Swarm --swarm Configure Machine with Swarm
--swarm-addr addr to advertise for Swarm (default: detect and use the machine IP) --swarm-addr addr to advertise for Swarm (default: detect and use the machine IP)