0
0
mirror of https://github.com/thegeeklab/wp-docker-buildx.git synced 2024-11-25 09:10:39 +00:00

feat: add cache_to option and remove manual image pull for cache_from images (#124)

This commit is contained in:
Martin Honermeyer 2022-08-08 13:36:23 +02:00 committed by GitHub
parent 9af3f0cec2
commit d264446eb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 17 deletions

View File

@ -143,6 +143,11 @@ properties:
type: list type: list
required: false required: false
cache_to:
description: [Cache destination](https://docs.docker.com/engine/reference/commandline/buildx_build/#cache-to) for the build cache.
type: string
required: false
pull_image: pull_image:
description: Enforce to pull the base image at build time. description: Enforce to pull the base image at build time.
defaultValue: true defaultValue: true

View File

@ -201,6 +201,13 @@ func settingsFlags(settings *plugin.Settings, category string) []cli.Flag {
Destination: &settings.Build.CacheFrom, Destination: &settings.Build.CacheFrom,
Category: category, Category: category,
}, },
&cli.StringFlag{
Name: "cache-to",
EnvVars: []string{"PLUGIN_CACHE_TO"},
Usage: "cache destination for the build cache",
Destination: &settings.Build.CacheTo,
Category: category,
},
&cli.BoolFlag{ &cli.BoolFlag{
Name: "pull-image", Name: "pull-image",
EnvVars: []string{"PLUGIN_PULL_IMAGE"}, EnvVars: []string{"PLUGIN_PULL_IMAGE"},

View File

@ -23,15 +23,6 @@ func commandLogin(login Login) *exec.Cmd {
) )
} }
// helper to check if args match "docker pull <image>"
func isCommandPull(args []string) bool {
return len(args) > 2 && args[1] == "pull"
}
func commandPull(repo string) *exec.Cmd {
return exec.Command(dockerExe, "pull", repo)
}
func commandLoginEmail(login Login) *exec.Cmd { func commandLoginEmail(login Login) *exec.Cmd {
return exec.Command( return exec.Command(
dockerExe, "login", dockerExe, "login",
@ -99,6 +90,9 @@ func commandBuild(build Build, dryrun bool) *exec.Cmd {
for _, arg := range build.CacheFrom.Value() { for _, arg := range build.CacheFrom.Value() {
args = append(args, "--cache-from", arg) args = append(args, "--cache-from", arg)
} }
if build.CacheTo != "" {
args = append(args, "--cache-to", build.CacheTo)
}
for _, arg := range build.ArgsEnv.Value() { for _, arg := range build.ArgsEnv.Value() {
addProxyValue(&build, arg) addProxyValue(&build, arg)
} }

View File

@ -53,6 +53,7 @@ type Build struct {
Target string // Docker build target Target string // Docker build target
Pull bool // Docker build pull Pull bool // Docker build pull
CacheFrom cli.StringSlice // Docker build cache-from CacheFrom cli.StringSlice // Docker build cache-from
CacheTo string // Docker build cache-to
Compress bool // Docker build compress Compress bool // Docker build compress
Repo string // Docker build repository Repo string // Docker build repository
NoCache bool // Docker build no-cache NoCache bool // Docker build no-cache
@ -166,11 +167,6 @@ func (p *Plugin) Execute() error {
cmds = append(cmds, commandBuilder(p.settings.Daemon)) cmds = append(cmds, commandBuilder(p.settings.Daemon))
cmds = append(cmds, commandBuildx()) cmds = append(cmds, commandBuildx())
// pre-pull cache images
for _, img := range p.settings.Build.CacheFrom.Value() {
cmds = append(cmds, commandPull(img))
}
cmds = append(cmds, commandBuild(p.settings.Build, p.settings.Dryrun)) // docker build cmds = append(cmds, commandBuild(p.settings.Build, p.settings.Dryrun)) // docker build
// execute all commands in batch mode. // execute all commands in batch mode.
@ -180,9 +176,7 @@ func (p *Plugin) Execute() error {
trace(cmd) trace(cmd)
err := cmd.Run() err := cmd.Run()
if err != nil && isCommandPull(cmd.Args) { if err != nil {
fmt.Printf("Could not pull cache-from image %s. Ignoring...\n", cmd.Args[2])
} else if err != nil {
return err return err
} }
} }