Merge dd8059925e into a5fb752ecf

docs/reference/commandline/container_run.md

@@ -963,7 +963,7 @@ This starts an `ubuntu` container with access to the specified CDI device,
 - A valid CDI specification (JSON or YAML file) for the requested device is
   available on the system running the daemon, in one of the configured CDI
   specification directories.
-- The CDI feature has been enabled in the daemon; see [Enable CDI
+- The CDI feature has been enabled in the daemon. See [Enable CDI
   devices](https://docs.docker.com/reference/cli/dockerd/#enable-cdi-devices).
 
 ### <a name="attach"></a> Attach to STDIN/STDOUT/STDERR (-a, --attach)
@@ -1572,4 +1572,4 @@ The `docker run` command is equivalent to the following API calls:
   - If that call returns a 404 (image not found), and depending on the `--pull` option ("always", "missing", "never") the call can trigger a `docker pull <image>`.
 - `/containers/create` again after pulling the image.
 - `/containers/(id)/start` to start the container.
-- `/containers/(id)/attach` to attach to the container when starting with the `-it` flags for interactive containers.
+- `/containers/(id)/attach` to attach to the container when starting with the `-it` flags for interactive containers.

opts/envfile_test.go

@@ -87,6 +87,25 @@ func TestParseEnvFileNonExistentFile(t *testing.T) {
 	}
 }
 
+// Test TestParseEnvFile for a badly formatted header
+func TestParseEnvFileFormattedWithSpace(t *testing.T) {
+	content := `
+	[config 1]
+	foo=bar
+    f=quux
+`
+	tmpFile := tmpFileWithContent(t, content)
+
+	_, err := ParseEnvFile(tmpFile)
+	if _, ok := err.(ErrBadKey); !ok {
+		t.Fatalf("Expected an ErrBadKey, got [%v]", err)
+	}
+	expectedMessage := "poorly formatted environment: variable '[config 1]' contains whitespaces"
+	if err.Error() != expectedMessage {
+		t.Fatalf("Expected [%v], got [%v]", expectedMessage, err.Error())
+	}
+}
+
 // Test ParseEnvFile for a badly formatted file
 func TestParseEnvFileBadlyFormattedFile(t *testing.T) {
 	content := `foo=bar