Merge pull request #22641 from cpuguy83/build_finalization

Adds ability to flatten image after build
This commit is contained in:
Michael Crosby 2016-11-01 14:30:18 -07:00 committed by GitHub
commit 09caa1ae97
1 changed files with 6 additions and 0 deletions

View File

@ -59,6 +59,7 @@ type buildOptions struct {
compress bool compress bool
securityOpt []string securityOpt []string
networkMode string networkMode string
squash bool
} }
// NewBuildCommand creates a new `docker build` command // NewBuildCommand creates a new `docker build` command
@ -110,6 +111,10 @@ func NewBuildCommand(dockerCli *command.DockerCli) *cobra.Command {
command.AddTrustedFlags(flags, true) command.AddTrustedFlags(flags, true)
if dockerCli.HasExperimental() {
flags.BoolVar(&options.squash, "squash", false, "Squash newly built layers into a single new layer")
}
return cmd return cmd
} }
@ -305,6 +310,7 @@ func runBuild(dockerCli *command.DockerCli, options buildOptions) error {
CacheFrom: options.cacheFrom, CacheFrom: options.cacheFrom,
SecurityOpt: options.securityOpt, SecurityOpt: options.securityOpt,
NetworkMode: options.networkMode, NetworkMode: options.networkMode,
Squash: options.squash,
} }
response, err := dockerCli.Client().ImageBuild(ctx, body, buildOptions) response, err := dockerCli.Client().ImageBuild(ctx, body, buildOptions)