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

Merge pull request #180 from The-Loeki/master

Browse Source 
Add support for non label-schema labels
This commit is contained in:
Brad Rydzewski 2018-09-10 19:53:50 -07:00 committed by GitHub
commit 9589237541
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,6 +171,11 @@ func main() {
Usage: "docker repository", Usage: "docker repository",
EnvVar: "PLUGIN_REPO", EnvVar: "PLUGIN_REPO",
}, },
cli.StringSliceFlag{
Name: "custom-labels",
Usage: "additional k=v labels",
EnvVar: "PLUGIN_CUSTOM_LABELS",
},
cli.StringSliceFlag{ cli.StringSliceFlag{
Name: "label-schema", Name: "label-schema",
Usage: "label-schema labels", Usage: "label-schema labels",
@ -242,6 +247,7 @@ func run(c *cli.Context) error {
Pull: c.BoolT("pull-image"), Pull: c.BoolT("pull-image"),
Compress: c.Bool("compress"), Compress: c.Bool("compress"),
Repo: c.String("repo"), Repo: c.String("repo"),
Labels: c.StringSlice("custom-labels"),
LabelSchema: c.StringSlice("label-schema"), LabelSchema: c.StringSlice("label-schema"),
NoCache: c.Bool("no-cache"), NoCache: c.Bool("no-cache"),
}, },

10
docker.go
View File

@ -49,7 +49,8 @@ type (
Pull bool // Docker build pull 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
LabelSchema []string // Label schema map LabelSchema []string // label-schema Label map
Labels []string // Label map
NoCache bool // Docker build no-cache NoCache bool // Docker build no-cache
} }
@ -214,6 +215,7 @@ func commandBuild(build Build) *exec.Cmd {
} }
labelSchema := []string{ labelSchema := []string{
"schema-version=1.0",
fmt.Sprintf("build-date=%s", time.Now().Format(time.RFC3339)), fmt.Sprintf("build-date=%s", time.Now().Format(time.RFC3339)),
fmt.Sprintf("vcs-ref=%s", build.Name), fmt.Sprintf("vcs-ref=%s", build.Name),
fmt.Sprintf("vcs-url=%s", build.Remote), fmt.Sprintf("vcs-url=%s", build.Remote),
@ -227,6 +229,12 @@ func commandBuild(build Build) *exec.Cmd {
args = append(args, "--label", fmt.Sprintf("org.label-schema.%s", label)) args = append(args, "--label", fmt.Sprintf("org.label-schema.%s", label))
} }
if len(build.Labels) > 0 {
for _, label := range build.Labels {
args = append(args, "--label", label)
}
}
return exec.Command(dockerExe, args...) return exec.Command(dockerExe, args...)
} }