Merge pull request #15028 from vbatts/typo
api/client/build: typo in error Upstream-commit: c451d597f2abef42bd26212d18844a03c3773818 Component: engine
This commit is contained in:
@@ -392,7 +392,7 @@ func getContextFromReader(r io.Reader, dockerfileName string) (absContextDir, re
|
||||
}
|
||||
|
||||
if err := archive.Untar(buf, absContextDir, nil); err != nil {
|
||||
return "", "", fmt.Errorf("unable to extract stdin to temporary context direcotry: %v", err)
|
||||
return "", "", fmt.Errorf("unable to extract stdin to temporary context directory: %v", err)
|
||||
}
|
||||
|
||||
return getDockerfileRelPath(absContextDir, dockerfileName)
|
||||
|
||||
@@ -427,7 +427,7 @@ func (s *DockerSuite) TestCpFromCaseH(c *check.C) {
|
||||
}
|
||||
}
|
||||
|
||||
// I. SRC specifies a direcotry's contents only and DST exists as a file. This
|
||||
// I. SRC specifies a directory's contents only and DST exists as a file. This
|
||||
// should cause an error as it is not possible to overwrite a file with a
|
||||
// directory.
|
||||
func (s *DockerSuite) TestCpFromCaseI(c *check.C) {
|
||||
|
||||
@@ -484,7 +484,7 @@ func (s *DockerSuite) TestCpToCaseH(c *check.C) {
|
||||
}
|
||||
}
|
||||
|
||||
// I. SRC specifies a direcotry's contents only and DST exists as a file. This
|
||||
// I. SRC specifies a directory's contents only and DST exists as a file. This
|
||||
// should cause an error as it is not possible to overwrite a file with a
|
||||
// directory.
|
||||
func (s *DockerSuite) TestCpToCaseI(c *check.C) {
|
||||
|
||||
@@ -565,7 +565,7 @@ func TestCopyCaseH(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// I. SRC specifies a direcotry's contents only and DST exists as a file. This
|
||||
// I. SRC specifies a directory's contents only and DST exists as a file. This
|
||||
// should cause an error as it is not possible to overwrite a file with a
|
||||
// directory.
|
||||
func TestCopyCaseI(t *testing.T) {
|
||||
|
||||
Reference in New Issue
Block a user