Skip to content

With Buildkit, don't pull docker images needlessly. #360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

With Buildkit, don't pull docker images needlessly. #360

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dadaaca
With Buildkit, don't pull docker images needlessly.
neil-ach Apr 7, 2022
e25cde0
Extract some logic into a helper function
neil-ach Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,13 @@ func (p Plugin) Exec() error {
cmds = append(cmds, commandVersion()) // docker version
cmds = append(cmds, commandInfo()) // docker info

// pre-pull cache images
for _, img := range p.Build.CacheFrom {
cmds = append(cmds, commandPull(img))
if wantPrepull(p) {
// pre-pull cache images
for _, img := range p.Build.CacheFrom {
cmds = append(cmds, commandPull(img))
}
} else {
fmt.Println("Detected Buildkit with inline cache, will not pre-pull cache image.")
}

cmds = append(cmds, commandBuild(p.Build)) // docker build
Expand Down Expand Up @@ -227,6 +231,22 @@ func (p Plugin) Exec() error {
return nil
}

// helper function to determine if we should prepull a cache image
func wantPrepull(p Plugin) bool {
var inlineCache = false
for _, v := range p.Build.Args {
if v == "BUILDKIT_INLINE_CACHE=1" {
inlineCache = true
break
}
}

// if we have both buildkit and buildkit inline cache available, then
// that is preferable to prepulling a cache image, for more details:
// https://github.com/drone-plugins/drone-docker/pull/360
return os.Getenv("DOCKER_BUILDKIT") != "1" || !inlineCache
}

// helper function to create the docker login command.
func commandLogin(login Login) *exec.Cmd {
if login.Email != "" {
Expand Down