fixes when no equal sign in label file

Signed-off-by: Lifubang <lifubang@acmcoder.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: lifubang

cli/command/container/opts_test.go

@@ -965,6 +965,25 @@ func TestParseEnvfileVariables(t *testing.T) {
 	}
 }
 
+func TestParseEnvfileVariablesWithoutEqualSign(t *testing.T) {
+	// env without equal sign
+	config, _, _, err := parseRun([]string{"--env-file=testdata/noequalsign.env", "img", "cmd"})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(config.Env) != 2 || config.Env[0] != "bar=" || config.Env[1] != "demo=true" {
+		t.Fatalf("Expected a config with [bar= demo=true], got %v", config.Env)
+	}
+	t.Setenv("foo", "bar")
+	config, _, _, err = parseRun([]string{"--env-file=testdata/noequalsign.env", "img", "cmd"})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(config.Env) != 3 || config.Env[0] != "foo=bar" || config.Env[1] != "bar=" || config.Env[2] != "demo=true" {
+		t.Fatalf("Expected a config with [foo=bar bar= demo=true], got %v", config.Env)
+	}
+}
+
 func TestParseEnvfileVariablesWithBOMUnicode(t *testing.T) {
 	// UTF8 with BOM
 	config, _, _, err := parseRun([]string{"--env-file=testdata/utf8.env", "img", "cmd"})
@@ -1018,6 +1037,24 @@ func TestParseLabelfileVariables(t *testing.T) {
 	}
 }
 
+func TestParseLabelfileVariablesWithoutEqualSign(t *testing.T) {
+	// label without equal sign
+	config, _, _, err := parseRun([]string{"--label-file=testdata/noequalsign.label", "img", "cmd"})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(config.Labels) != 3 || config.Labels["demo"] != "true" || config.Labels["foo"] != "" || config.Labels["bar"] != "" {
+		t.Fatalf("Expected a config with [foo: bar: demo=true], got %v", config.Labels)
+	}
+	config, _, _, err = parseRun([]string{"--label-file=testdata/noequalsign.label", "--label=foo=bar", "img", "cmd"})
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(config.Labels) != 3 || config.Labels["demo"] != "true" || config.Labels["foo"] != "bar" || config.Labels["bar"] != "" {
+		t.Fatalf("Expected a config with [foo=bar bar: demo:true], got %v", config.Labels)
+	}
+}
+
 func TestParseEntryPoint(t *testing.T) {
 	config, _, _, err := parseRun([]string{"--entrypoint=anything", "cmd", "img"})
 	assert.NilError(t, err)

cli/command/container/testdata/noequalsign.env

@@ -0,0 +1,3 @@
+foo
+bar=
+demo=true

cli/command/container/testdata/noequalsign.label

@@ -0,0 +1,3 @@
+foo
+bar=
+demo=true

opts/parse.go

@@ -13,7 +13,9 @@ import (
 // ReadKVStrings reads a file of line terminated key=value pairs, and overrides any keys
 // present in the file with additional pairs specified in the override parameter
 func ReadKVStrings(files []string, override []string) ([]string, error) {
-	return readKVStrings(files, override, nil)
+	return readKVStrings(files, override, func(string) (string, bool) {
+		return "", true
+	})
 }
 
 // ReadKVEnvStrings reads a file of line terminated key=value pairs, and overrides any keys