beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update the option 'network' for docker build

Browse source 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit cd317282c9)
Signed-off-by: Victor Vieux <vieux@docker.com>
This commit is contained in:
yuexiao-wang 2016-12-09 23:15:26 +08:00 committed by Victor Vieux
parent 4aa72cb5a9
commit 54e52b97f4
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cli/command/image/build.go
View file

@ -107,7 +107,7 @@ func NewBuildCommand(dockerCli *command.DockerCli) *cobra.Command {
flags.StringSliceVar(&options.cacheFrom, "cache-from", []string{}, "Images to consider as cache sources")
flags.BoolVar(&options.compress, "compress", false, "Compress the build context using gzip")
flags.StringSliceVar(&options.securityOpt, "security-opt", []string{}, "Security options")
flags.StringVar(&options.networkMode, "network", "default", "Connect a container to a network")
flags.StringVar(&options.networkMode, "network", "default", "Set the networking mode for the RUN instructions during build")
command.AddTrustedFlags(flags, true)

5
docs/reference/commandline/build.md
View file

@ -38,8 +38,7 @@ Options:
--label value Set metadata for an image (default [])
-m, --memory string Memory limit
--memory-swap string Swap limit equal to memory plus swap: '-1' to enable unlimited swap
--network string Set the networking mode for the run commands
during build.
--network string Set the networking mode for the RUN instructions during build
'bridge': use default Docker bridge
'none': no networking
'container:<name|id>': reuse another container's network stack
@ -54,7 +53,7 @@ Options:
The format is `<number><unit>`. `number` must be greater than `0`.
Unit is optional and can be `b` (bytes), `k` (kilobytes), `m` (megabytes),
or `g` (gigabytes). If you omit the unit, the system uses bytes.
--squash Squash newly built layers into a single new layer (**Experimental Only**)
--squash Squash newly built layers into a single new layer (**Experimental Only**)
-t, --tag value Name and optionally a tag in the 'name:tag' format (default [])
--ulimit value Ulimit options (default [])
```

6
man/docker-build.1.md
View file

@ -2,7 +2,7 @@
% Docker Community
% JUNE 2014
# NAME
docker-build - Build a new image from the source code at PATH
docker-build - Build an image from a Dockerfile
# SYNOPSIS
**docker build**
@ -130,7 +130,9 @@ set as the **URL**, the repository is cloned locally and then sent as the contex
unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap.
**--network**=*NETWORK*
Set the networking mode for the RUN instructions during build. Supported standard
values are: `bridge`, `host`, `none` and `container:<name|id>`. Any other value
is taken as a custom network's name or ID which this container should connect to.
**--shm-size**=*SHM-SIZE*
Size of `/dev/shm`. The format is `<number><unit>`. `number` must be greater than `0`.