Signed-off-by: Jessica Frazelle <princess@docker.com>
| ... | ... |
@@ -124,7 +124,7 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba |
| 124 | 124 |
dataPath = d.containerDir(c.ID) |
| 125 | 125 |
) |
| 126 | 126 |
|
| 127 |
- if c.Network.NamespacePath == "" && c.Network.ContainerID == "" {
|
|
| 127 |
+ if c.Network == nil || (c.Network.NamespacePath == "" && c.Network.ContainerID == "") {
|
|
| 128 | 128 |
return execdriver.ExitStatus{ExitCode: -1}, fmt.Errorf("empty namespace path for non-container network")
|
| 129 | 129 |
} |
| 130 | 130 |
|
| ... | ... |
@@ -53,6 +53,7 @@ func (s *DockerSuite) TestRunEchoStdoutWithMemoryLimit(c *check.C) {
|
| 53 | 53 |
|
| 54 | 54 |
// should run without memory swap |
| 55 | 55 |
func (s *DockerSuite) TestRunWithoutMemoryswapLimit(c *check.C) {
|
| 56 |
+ testRequires(c, NativeExecDriver) |
|
| 56 | 57 |
runCmd := exec.Command(dockerBinary, "run", "-m", "16m", "--memory-swap", "-1", "busybox", "true") |
| 57 | 58 |
out, _, err := runCommandWithOutput(runCmd) |
| 58 | 59 |
if err != nil {
|