ソースを参照

fix lxc build

Signed-off-by: Jessica Frazelle <princess@docker.com>
Jessica Frazelle 10 年 前
コミット
0adfb908a6
2 ファイル変更2 行追加1 行削除
  1. 1 1
      daemon/execdriver/lxc/driver.go
  2. 1 0
      integration-cli/docker_cli_run_test.go

+ 1 - 1
daemon/execdriver/lxc/driver.go

@@ -124,7 +124,7 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
 		dataPath = d.containerDir(c.ID)
 	)
 
-	if c.Network.NamespacePath == "" && c.Network.ContainerID == "" {
+	if c.Network == nil || (c.Network.NamespacePath == "" && c.Network.ContainerID == "") {
 		return execdriver.ExitStatus{ExitCode: -1}, fmt.Errorf("empty namespace path for non-container network")
 	}
 

+ 1 - 0
integration-cli/docker_cli_run_test.go

@@ -53,6 +53,7 @@ func (s *DockerSuite) TestRunEchoStdoutWithMemoryLimit(c *check.C) {
 
 // should run without memory swap
 func (s *DockerSuite) TestRunWithoutMemoryswapLimit(c *check.C) {
+	testRequires(c, NativeExecDriver)
 	runCmd := exec.Command(dockerBinary, "run", "-m", "16m", "--memory-swap", "-1", "busybox", "true")
 	out, _, err := runCommandWithOutput(runCmd)
 	if err != nil {