Merge pull request #2035 from rudyfly/volume

bugfix: failed to start container when /etc/mtab is symbol link

.travis.yml

@@ -23,7 +23,7 @@ env:
 script: |
   if [[ "${TEST_SUITE}" = "unittest" ]]; then
     hack/install/install_ci_related.sh
-    make unit-test
+    make unit-test || travis_terminate 1
     make coverage
   elif [[ "${TEST_SUITE}" = "integrationtest" ]]; then
     make build
@@ -32,23 +32,23 @@ script: |
     sudo env "PATH=$PATH" make install
 
     sudo env "PATH=$PATH" make download_dependencies
-    sudo env "PATH=$PATH" make integration-test
+    sudo env "PATH=$PATH" make integration-test || travis_terminate 1
     make coverage
   elif [[ "${TEST_SUITE}" = "criv1alpha1test" ]]; then
     make build
     TEST_FLAGS= make build-daemon-integration
     sudo env "PATH=$PATH" make install
 
     sudo env "PATH=$PATH" make download_dependencies
-    sudo env "PATH=$PATH" make cri-v1alpha1-test
+    sudo env "PATH=$PATH" make cri-v1alpha1-test || travis_terminate 1
     make coverage
   else
     make build
     TEST_FLAGS= make build-daemon-integration
     sudo env "PATH=$PATH" make install
 
     sudo env "PATH=$PATH" make download_dependencies
-    sudo env "PATH=$PATH" make cri-v1alpha2-test
+    sudo env "PATH=$PATH" make cri-v1alpha2-test || travis_terminate 1
     make coverage
   fi
   

daemon/mgr/spec_hook.go

@@ -145,7 +145,7 @@ func setMountTab(ctx context.Context, c *Container, spec *SpecWrapper) error {
 
 	mtabPrestart := specs.Hook{
 		Path: "/bin/cp",
-		Args: []string{"-f", hostmtabPath, mtabPath},
+		Args: []string{"-f", "--remove-destination", hostmtabPath, mtabPath},
 	}
 	spec.s.Hooks.Prestart = append(spec.s.Hooks.Prestart, mtabPrestart)
 

test/cli_run_test.go

@@ -422,3 +422,24 @@ func (suite *PouchRunSuite) TestRunSetRunningFlag(c *check.C) {
 	}
 	c.Assert(result[0].State.Running, check.Equals, true)
 }
+
+func (suite *PouchRunSuite) TestRunWithMtab(c *check.C) {
+	cname := "TestRunWithMtab"
+	volumeName := "TestRunWithMtabVolume"
+	dest := "/mnt/" + volumeName
+
+	command.PouchRun("volume", "create", "--name", volumeName).Assert(c, icmd.Success)
+	defer command.PouchRun("volume", "rm", volumeName).Assert(c, icmd.Success)
+
+	ret := command.PouchRun("run", "--rm", "--name", cname, "-v", volumeName+":"+dest, busyboxImage, "cat", "/etc/mtab").Assert(c, icmd.Success)
+	ret.Assert(c, icmd.Success)
+
+	found := false
+	for _, line := range strings.Split(ret.Stdout(), "\n") {
+		if strings.Contains(line, dest) {
+			found = true
+			break
+		}
+	}
+	c.Assert(found, check.Equals, true)
+}