diff --git a/cmd/drone-docker-buildx/config.go b/cmd/drone-docker-buildx/config.go index 581962b..4ee3f34 100644 --- a/cmd/drone-docker-buildx/config.go +++ b/cmd/drone-docker-buildx/config.go @@ -163,12 +163,6 @@ func settingsFlags(settings *plugin.Settings) []cli.Flag { EnvVars: []string{"PLUGIN_CACHE_FROM"}, Destination: &settings.Build.CacheFrom, }, - &cli.BoolFlag{ - Name: "squash", - Usage: "squash the layers at build time", - EnvVars: []string{"PLUGIN_SQUASH"}, - Destination: &settings.Build.Squash, - }, &cli.BoolFlag{ Name: "pull-image", Usage: "force pull base image at build time", diff --git a/plugin/docker.go b/plugin/docker.go index 903c6cc..e5a8509 100644 --- a/plugin/docker.go +++ b/plugin/docker.go @@ -87,9 +87,6 @@ func commandBuild(build Build, dryrun bool) *exec.Cmd { if !dryrun { args = append(args, "--push") } - if build.Squash { - args = append(args, "--squash") - } if build.Compress { args = append(args, "--compress") } diff --git a/plugin/impl.go b/plugin/impl.go index bfdadd7..7c804ba 100644 --- a/plugin/impl.go +++ b/plugin/impl.go @@ -52,7 +52,6 @@ type Build struct { Args cli.StringSlice // Docker build args ArgsEnv cli.StringSlice // Docker build args from env Target string // Docker build target - Squash bool // Docker build squash Pull bool // Docker build pull CacheFrom cli.StringSlice // Docker build cache-from Compress bool // Docker build compress @@ -155,11 +154,6 @@ func (p *Plugin) Execute() error { fmt.Println("Registry credentials or Docker config not provided. Guest mode enabled.") } - if p.settings.Build.Squash && !p.settings.Daemon.Experimental { - fmt.Println("Squash build flag is only available when Docker deamon is started with experimental flag. Ignoring...") - p.settings.Build.Squash = false - } - // add proxy build args addProxyBuildArgs(&p.settings.Build)