PapaTutuWawa/woodpecker-docker-buildx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: remove unimplemented squash option (#52)

Browse Source
This commit is contained in:
Robert Kaussow 2021-09-07 21:34:47 +02:00 committed by GitHub
parent 708587693c
commit 276f215b24
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/drone-docker-buildx/config.go
View File

@ -163,12 +163,6 @@ func settingsFlags(settings *plugin.Settings) []cli.Flag {
EnvVars: []string{"PLUGIN_CACHE_FROM"}, EnvVars: []string{"PLUGIN_CACHE_FROM"},
Destination: &settings.Build.CacheFrom, 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{ &cli.BoolFlag{
Name: "pull-image", Name: "pull-image",
Usage: "force pull base image at build time", Usage: "force pull base image at build time",

3
plugin/docker.go
View File

@ -87,9 +87,6 @@ func commandBuild(build Build, dryrun bool) *exec.Cmd {
if !dryrun { if !dryrun {
args = append(args, "--push") args = append(args, "--push")
} }
if build.Squash {
args = append(args, "--squash")
}
if build.Compress { if build.Compress {
args = append(args, "--compress") args = append(args, "--compress")
} }

6
plugin/impl.go
View File

@ -52,7 +52,6 @@ type Build struct {
Args cli.StringSlice // Docker build args Args cli.StringSlice // Docker build args
ArgsEnv cli.StringSlice // Docker build args from env ArgsEnv cli.StringSlice // Docker build args from env
Target string // Docker build target Target string // Docker build target
Squash bool // Docker build squash
Pull bool // Docker build pull Pull bool // Docker build pull
CacheFrom cli.StringSlice // Docker build cache-from CacheFrom cli.StringSlice // Docker build cache-from
Compress bool // Docker build compress 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.") 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 // add proxy build args
addProxyBuildArgs(&p.settings.Build) addProxyBuildArgs(&p.settings.Build)