Просмотр исходного кода

Fix a typo in hostConfig.ShmSize validation

Other places referring to the same configuration, including docs, have
the correct spelling.

Signed-off-by: Rodolfo Carvalho <rhcarvalho@gmail.com>
Rodolfo Carvalho 9 лет назад
Родитель
Сommit
fee7e7c7a3
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      daemon/daemon_unix.go
  2. 1 1
      integration-cli/docker_api_containers_test.go

+ 1 - 1
daemon/daemon_unix.go

@@ -525,7 +525,7 @@ func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.
 	warnings = append(warnings, w...)
 	warnings = append(warnings, w...)
 
 
 	if hostConfig.ShmSize < 0 {
 	if hostConfig.ShmSize < 0 {
-		return warnings, fmt.Errorf("SHM size must be greater then 0")
+		return warnings, fmt.Errorf("SHM size must be greater than 0")
 	}
 	}
 
 
 	if hostConfig.OomScoreAdj < -1000 || hostConfig.OomScoreAdj > 1000 {
 	if hostConfig.OomScoreAdj < -1000 || hostConfig.OomScoreAdj > 1000 {

+ 1 - 1
integration-cli/docker_api_containers_test.go

@@ -1462,7 +1462,7 @@ func (s *DockerSuite) TestPostContainersCreateShmSizeNegative(c *check.C) {
 	status, body, err := sockRequest("POST", "/containers/create", config)
 	status, body, err := sockRequest("POST", "/containers/create", config)
 	c.Assert(err, check.IsNil)
 	c.Assert(err, check.IsNil)
 	c.Assert(status, check.Equals, http.StatusInternalServerError)
 	c.Assert(status, check.Equals, http.StatusInternalServerError)
-	c.Assert(string(body), checker.Contains, "SHM size must be greater then 0")
+	c.Assert(string(body), checker.Contains, "SHM size must be greater than 0")
 }
 }
 
 
 func (s *DockerSuite) TestPostContainersCreateShmSizeHostConfigOmitted(c *check.C) {
 func (s *DockerSuite) TestPostContainersCreateShmSizeHostConfigOmitted(c *check.C) {