github/wp-docker-buildx
0
0
Fork 0
mirror of https://github.com/thegeeklab/wp-docker-buildx.git synced 2024-11-22 10:10:39 +00:00
Code Issues Releases Activity

Merge pull request #110 from JeffDownie/allow_using_cached_base_image

Browse Source 
allowing docker to use cached base image in build
This commit is contained in:
Brad Rydzewski 2017-02-21 21:32:26 +11:00 committed by GitHub
commit f606fcf698
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main.go
View File

@ -118,6 +118,11 @@ func main() {
Usage: "squash the layers at build time", Usage: "squash the layers at build time",
EnvVar: "PLUGIN_SQUASH", EnvVar: "PLUGIN_SQUASH",
}, },
cli.BoolTFlag{
Name: "pull-image",
Usage: "force pull base image at build time",
EnvVar: "PLUGIN_PULL_IMAGE",
},
cli.BoolFlag{ cli.BoolFlag{
Name: "compress", Name: "compress",
Usage: "compress the build context using gzip", Usage: "compress the build context using gzip",
@ -172,6 +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"),
Pull: c.BoolT("pull-image"),
Compress: c.Bool("compress"), Compress: c.Bool("compress"),
Repo: c.String("repo"), Repo: c.String("repo"),
}, },

7
plugin.go
View File

@ -47,6 +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
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
} }
@ -185,9 +186,8 @@ 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",
"--pull=true",
"--rm=true", "--rm=true",
"-f", build.Dockerfile, "-f", build.Dockerfile,
"-t", build.Name, "-t", build.Name,
@ -200,6 +200,9 @@ func commandBuild(build Build) *exec.Cmd {
if build.Compress { if build.Compress {
args = append(args, "--compress") args = append(args, "--compress")
} }
if build.Pull {
args = append(args, "--pull=true")
}
for _, arg := range build.Args { for _, arg := range build.Args {
args = append(args, "--build-arg", arg) args = append(args, "--build-arg", arg)
} }