don't use -al

.tko.yml

@@ -1,7 +1,7 @@
 build:
   destination-path: /usr/local/bin
   entrypoint: /usr/local/bin/tko
-  labels:
+  default-labels:
     org.opencontainers.image.title: tko
     org.opencontainers.image.url: github.com/dskiff/tko
     org.opencontainers.image.source: github.com/dskiff/tko

main_test.go

@@ -22,9 +22,12 @@ build:
   target-repo: repo/target
 
   author: me
-  labels:
+  default-labels:
     label1: value1
     label2: value2
+  labels:
+    label3: value3
+    label4: value4
   
   tmp: /tmp-dir
   verbose: true
@@ -47,8 +50,10 @@ build:
 	assert.Equal(t, "repo/target", cli.Build.TargetRepo)
 
 	assert.Equal(t, "me", cli.Build.Author)
-	assert.Equal(t, "value1", cli.Build.Labels["label1"])
-	assert.Equal(t, "value2", cli.Build.Labels["label2"])
+	assert.Equal(t, "value1", cli.Build.DefaultLabels["label1"])
+	assert.Equal(t, "value2", cli.Build.DefaultLabels["label2"])
+	assert.Equal(t, "value3", cli.Build.Labels["label3"])
+	assert.Equal(t, "value4", cli.Build.Labels["label4"])
 
 	assert.Equal(t, "/tmp-dir", cli.Build.Tmp)
 	assert.Equal(t, true, cli.Build.Verbose)
@@ -73,8 +78,10 @@ func TestBuildArgs(t *testing.T) {
 		"-d", "/destination",
 		"-t", "repo/target",
 		"-a", "me",
-		"-l", "label1=value1",
-		"-l", "label2=value2",
+		"-L", "label1=value1",
+		"-L", "label2=value2",
+		"-l", "label3=value3",
+		"-l", "label4=value4",
 		"-T", "REMOTE",
 		"-v",
 		"--tmp", "/tmp-dir",
@@ -90,8 +97,10 @@ func TestBuildArgs(t *testing.T) {
 	assert.Equal(t, "repo/target", cli.Build.TargetRepo)
 
 	assert.Equal(t, "me", cli.Build.Author)
-	assert.Equal(t, "value1", cli.Build.Labels["label1"])
-	assert.Equal(t, "value2", cli.Build.Labels["label2"])
+	assert.Equal(t, "value1", cli.Build.DefaultLabels["label1"])
+	assert.Equal(t, "value2", cli.Build.DefaultLabels["label2"])
+	assert.Equal(t, "value3", cli.Build.Labels["label3"])
+	assert.Equal(t, "value4", cli.Build.Labels["label4"])
 
 	assert.Equal(t, "/tmp-dir", cli.Build.Tmp)
 	assert.Equal(t, true, cli.Build.Verbose)

pkg/cmd/build.go

@@ -25,9 +25,9 @@ type BuildCmd struct {
 	TargetRepo string `short:"t" help:"Target repository" env:"TKO_TARGET_REPO" required:"true"`
 	TargetType string `short:"T" help:"Target type" env:"TKO_TARGET_TYPE" default:"REMOTE" enum:"REMOTE,LOCAL_DAEMON,LOCAL_FILE"`
 
-	Author           string            `short:"a" help:"Author of the build" env:"TKO_AUTHOR" default:"github.com/dskiff/tko"`
-	Labels           map[string]string `short:"l" help:"Labels to apply to the image" env:"TKO_LABELS" default:"" mapsep:"," sep:"="`
-	AdditionalLabels map[string]string `short:"al" help:"Additional labels to apply to the image" env:"TKO_ADDITIONAL_LABELS" default:"" mapsep:"," sep:"="`
+	Author        string            `short:"a" help:"Author of the build" env:"TKO_AUTHOR" default:"github.com/dskiff/tko"`
+	DefaultLabels map[string]string `short:"L" help:"Default labels to apply to the image" env:"TKO_DEFAULT_LABELS" default:"" mapsep:"," sep:"="`
+	Labels        map[string]string `short:"l" help:"Additional labels to apply to the image. Can override default-labels." env:"LABELS" default:"" mapsep:"," sep:"="`
 
 	Tmp     string `help:"Path where tko can write temporary files. Defaults to golang's tmp logic." env:"TKO_TMP" default:""`
 	Verbose bool   `short:"v" help:"Enable verbose output"`
@@ -52,10 +52,10 @@ func (b *BuildCmd) Run(cliCtx *CliCtx) error {
 
 	// Labels would ideally be merged by kong, but this works too
 	labels := make(map[string]string)
-	for k, v := range b.Labels {
+	for k, v := range b.DefaultLabels {
 		labels[k] = v
 	}
-	for k, v := range b.AdditionalLabels {
+	for k, v := range b.Labels {
 		labels[k] = v
 	}