Skip to content
This repository was archived by the owner on Aug 29, 2023. It is now read-only.

Commit 276f215

Browse files
authored
fix: remove unimplemented squash option (#52)
1 parent 7085876 commit 276f215

File tree

3 files changed

+0
-15
lines changed

3 files changed

+0
-15
lines changed

cmd/drone-docker-buildx/config.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,6 @@ func settingsFlags(settings *plugin.Settings) []cli.Flag {
163163
EnvVars: []string{"PLUGIN_CACHE_FROM"},
164164
Destination: &settings.Build.CacheFrom,
165165
},
166-
&cli.BoolFlag{
167-
Name: "squash",
168-
Usage: "squash the layers at build time",
169-
EnvVars: []string{"PLUGIN_SQUASH"},
170-
Destination: &settings.Build.Squash,
171-
},
172166
&cli.BoolFlag{
173167
Name: "pull-image",
174168
Usage: "force pull base image at build time",

plugin/docker.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@ func commandBuild(build Build, dryrun bool) *exec.Cmd {
8787
if !dryrun {
8888
args = append(args, "--push")
8989
}
90-
if build.Squash {
91-
args = append(args, "--squash")
92-
}
9390
if build.Compress {
9491
args = append(args, "--compress")
9592
}

plugin/impl.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ type Build struct {
5252
Args cli.StringSlice // Docker build args
5353
ArgsEnv cli.StringSlice // Docker build args from env
5454
Target string // Docker build target
55-
Squash bool // Docker build squash
5655
Pull bool // Docker build pull
5756
CacheFrom cli.StringSlice // Docker build cache-from
5857
Compress bool // Docker build compress
@@ -155,11 +154,6 @@ func (p *Plugin) Execute() error {
155154
fmt.Println("Registry credentials or Docker config not provided. Guest mode enabled.")
156155
}
157156

158-
if p.settings.Build.Squash && !p.settings.Daemon.Experimental {
159-
fmt.Println("Squash build flag is only available when Docker deamon is started with experimental flag. Ignoring...")
160-
p.settings.Build.Squash = false
161-
}
162-
163157
// add proxy build args
164158
addProxyBuildArgs(&p.settings.Build)
165159

0 commit comments

Comments
 (0)