Merge pull request #27702 from tonistiigi/net-builder0

add --network option for docker build
This commit is contained in:
Sebastiaan van Stijn 2016-10-25 21:50:33 -07:00 committed by GitHub
commit 4c4545c92f
1 changed files with 3 additions and 0 deletions

View File

@ -58,6 +58,7 @@ type buildOptions struct {
cacheFrom []string cacheFrom []string
compress bool compress bool
securityOpt []string securityOpt []string
networkMode string
} }
// NewBuildCommand creates a new `docker build` command // NewBuildCommand creates a new `docker build` command
@ -105,6 +106,7 @@ func NewBuildCommand(dockerCli *command.DockerCli) *cobra.Command {
flags.StringSliceVar(&options.cacheFrom, "cache-from", []string{}, "Images to consider as cache sources") 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.BoolVar(&options.compress, "compress", false, "Compress the build context using gzip")
flags.StringSliceVar(&options.securityOpt, "security-opt", []string{}, "Security options") flags.StringSliceVar(&options.securityOpt, "security-opt", []string{}, "Security options")
flags.StringVar(&options.networkMode, "network", "default", "Connect a container to a network")
command.AddTrustedFlags(flags, true) command.AddTrustedFlags(flags, true)
@ -302,6 +304,7 @@ func runBuild(dockerCli *command.DockerCli, options buildOptions) error {
Labels: runconfigopts.ConvertKVStringsToMap(options.labels.GetAll()), Labels: runconfigopts.ConvertKVStringsToMap(options.labels.GetAll()),
CacheFrom: options.cacheFrom, CacheFrom: options.cacheFrom,
SecurityOpt: options.securityOpt, SecurityOpt: options.securityOpt,
NetworkMode: options.networkMode,
} }
response, err := dockerCli.Client().ImageBuild(ctx, body, buildOptions) response, err := dockerCli.Client().ImageBuild(ctx, body, buildOptions)