Merge pull request #180 from The-Loeki/master

Add support for non label-schema labels

cmd/drone-docker/main.go

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

docker.go

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