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

Renaming use_cache to pull_image

Browse Source
This commit is contained in:
Jeff Downie 2017-02-20 11:40:35 +00:00
parent 5d96ed01d2
commit 8551bcc59f
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -26,6 +26,3 @@ _testmain.go
coverage.out coverage.out
drone-docker drone-docker
# IDE/Editor related files
**.swp

8
main.go
View File

@ -119,9 +119,9 @@ func main() {
EnvVar: "PLUGIN_SQUASH", EnvVar: "PLUGIN_SQUASH",
}, },
cli.BoolTFlag{ cli.BoolTFlag{
Name: "cache", Name: "pull-image",
Usage: "don't attempt to re-build layers of the image that already exist", Usage: "force pull base image at build time",
EnvVar: "PLUGIN_USE_CACHE", EnvVar: "PLUGIN_PULL_IMAGE",
}, },
cli.BoolFlag{ cli.BoolFlag{
Name: "compress", Name: "compress",
@ -177,7 +177,7 @@ func run(c *cli.Context) error {
Tags: c.StringSlice("tags"), Tags: c.StringSlice("tags"),
Args: c.StringSlice("args"), Args: c.StringSlice("args"),
Squash: c.Bool("squash"), Squash: c.Bool("squash"),
Cache: c.Bool("cache"), Pull: c.BoolT("pull-image"),
Compress: c.Bool("compress"), Compress: c.Bool("compress"),
Repo: c.String("repo"), Repo: c.String("repo"),
}, },

8
plugin.go
View File

@ -47,7 +47,7 @@ type (
Tags []string // Docker build tags Tags []string // Docker build tags
Args []string // Docker build args Args []string // Docker build args
Squash bool // Docker build squash Squash bool // Docker build squash
Cache bool // Docker build without pulling Pull bool // Docker build pull
Compress bool // Docker build compress Compress bool // Docker build compress
Repo string // Docker build repository Repo string // Docker build repository
} }
@ -186,7 +186,7 @@ func commandInfo() *exec.Cmd {
// helper function to create the docker build command. // helper function to create the docker build command.
func commandBuild(build Build) *exec.Cmd { func commandBuild(build Build) *exec.Cmd {
args := []string { args := []string{
"build", "build",
"--rm=true", "--rm=true",
"-f", build.Dockerfile, "-f", build.Dockerfile,
@ -200,9 +200,7 @@ func commandBuild(build Build) *exec.Cmd {
if build.Compress { if build.Compress {
args = append(args, "--compress") args = append(args, "--compress")
} }
if build.Cache { if build.Pull {
args = append(args, "--pull=false")
} else {
args = append(args, "--pull=true") args = append(args, "--pull=true")
} }
for _, arg := range build.Args { for _, arg := range build.Args {