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

add build_args_from_env parameter

Browse Source
This commit is contained in:
Brad Rydzewski 2017-08-27 16:28:58 -07:00
parent f25b013937
commit 2c6cbdba0d
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/drone-docker/main.go
View File

@ -126,6 +126,11 @@ func main() {
Usage: "build args", Usage: "build args",
EnvVar: "PLUGIN_BUILD_ARGS", EnvVar: "PLUGIN_BUILD_ARGS",
}, },
cli.StringSliceFlag{
Name: "args-from-env",
Usage: "build args",
EnvVar: "PLUGIN_BUILD_ARGS_FROM_ENV",
},
cli.BoolFlag{ cli.BoolFlag{
Name: "squash", Name: "squash",
Usage: "squash the layers at build time", Usage: "squash the layers at build time",
@ -195,6 +200,7 @@ func run(c *cli.Context) error {
Context: c.String("context"), Context: c.String("context"),
Tags: c.StringSlice("tags"), Tags: c.StringSlice("tags"),
Args: c.StringSlice("args"), Args: c.StringSlice("args"),
ArgsEnv: c.StringSlice("args-from-env"),
Squash: c.Bool("squash"), Squash: c.Bool("squash"),
Pull: c.BoolT("pull-image"), Pull: c.BoolT("pull-image"),
Compress: c.Bool("compress"), Compress: c.Bool("compress"),

4
docker.go
View File

@ -43,6 +43,7 @@ type (
Context string // Docker build context Context string // Docker build context
Tags []string // Docker build tags Tags []string // Docker build tags
Args []string // Docker build args Args []string // Docker build args
ArgsEnv []string // Docker build args from env
Squash bool // Docker build squash Squash bool // Docker build squash
Pull bool // Docker build pull Pull bool // Docker build pull
Compress bool // Docker build compress Compress bool // Docker build compress
@ -194,6 +195,9 @@ func commandBuild(build Build) *exec.Cmd {
if build.Pull { if build.Pull {
args = append(args, "--pull=true") args = append(args, "--pull=true")
} }
for _, arg := range build.ArgsEnv {
addProxyValue(&build, arg)
}
for _, arg := range build.Args { for _, arg := range build.Args {
args = append(args, "--build-arg", arg) args = append(args, "--build-arg", arg)
} }