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

append users build-args to the default slice

Browse Source
This commit is contained in:
Robert Kaussow 2021-01-22 12:57:32 +01:00
parent 113599ff08
commit 410d80eb98
No known key found for this signature in database
GPG Key ID: 65362AE74AF98B61
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugin/docker.go
View File

@ -71,6 +71,10 @@ func commandBuild(build Build) *exec.Cmd {
"-t", build.Name, "-t", build.Name,
} }
defaultBuildArgs := []string{
fmt.Sprintf("DOCKER_IMAGE_CREATED=%s", time.Now().Format(time.RFC3339)),
}
args = append(args, build.Context) args = append(args, build.Context)
if build.Squash { if build.Squash {
args = append(args, "--squash") args = append(args, "--squash")
@ -90,7 +94,7 @@ func commandBuild(build Build) *exec.Cmd {
for _, arg := range build.ArgsEnv.Value() { for _, arg := range build.ArgsEnv.Value() {
addProxyValue(&build, arg) addProxyValue(&build, arg)
} }
for _, arg := range build.Args.Value() { for _, arg := range append(defaultBuildArgs, build.Args.Value()...) {
args = append(args, "--build-arg", arg) args = append(args, "--build-arg", arg)
} }
for _, host := range build.AddHost.Value() { for _, host := range build.AddHost.Value() {
@ -107,9 +111,6 @@ func commandBuild(build Build) *exec.Cmd {
args = append(args, "--platform", strings.Join(build.Platforms.Value()[:], ",")) args = append(args, "--platform", strings.Join(build.Platforms.Value()[:], ","))
} }
// append generated build args
args = append(args, "--build-arg", fmt.Sprintf("DOCKER_IMAGE_CREATED=%s", time.Now().Format(time.RFC3339)))
return exec.Command(dockerExe, args...) return exec.Command(dockerExe, args...)
} }