mirror of
				https://github.com/moby/moby.git
				synced 2022-11-09 12:21:53 -05:00 
			
		
		
		
	This fix tries to address the issue in 26173 where `docker import -c` with quoted flags returns an error. The issue was that in `api/client/image/import.go` the flag `--change/-c` was handled by `StringSliceVarP` which does not handle the quote well. The similiar issue was enountered for 23309 (`docker commit`). This fix takes the same approach as 23309 where `StringSliceVarP` was replaced with `VarP` and `opts.ListOpts`. An integration test has been added to cover the changes. This fix fixes 26173. Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
		
			
				
	
	
		
			150 lines
		
	
	
	
		
			5.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			150 lines
		
	
	
	
		
			5.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
package main
 | 
						|
 | 
						|
import (
 | 
						|
	"bufio"
 | 
						|
	"compress/gzip"
 | 
						|
	"io/ioutil"
 | 
						|
	"os"
 | 
						|
	"os/exec"
 | 
						|
	"regexp"
 | 
						|
	"strings"
 | 
						|
 | 
						|
	"github.com/docker/docker/pkg/integration/checker"
 | 
						|
	icmd "github.com/docker/docker/pkg/integration/cmd"
 | 
						|
	"github.com/go-check/check"
 | 
						|
)
 | 
						|
 | 
						|
func (s *DockerSuite) TestImportDisplay(c *check.C) {
 | 
						|
	testRequires(c, DaemonIsLinux)
 | 
						|
	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
 | 
						|
	cleanedContainerID := strings.TrimSpace(out)
 | 
						|
 | 
						|
	out, _, err := runCommandPipelineWithOutput(
 | 
						|
		exec.Command(dockerBinary, "export", cleanedContainerID),
 | 
						|
		exec.Command(dockerBinary, "import", "-"),
 | 
						|
	)
 | 
						|
	c.Assert(err, checker.IsNil)
 | 
						|
 | 
						|
	c.Assert(out, checker.Count, "\n", 1, check.Commentf("display is expected 1 '\\n' but didn't"))
 | 
						|
 | 
						|
	image := strings.TrimSpace(out)
 | 
						|
	out, _ = dockerCmd(c, "run", "--rm", image, "true")
 | 
						|
	c.Assert(out, checker.Equals, "", check.Commentf("command output should've been nothing."))
 | 
						|
}
 | 
						|
 | 
						|
func (s *DockerSuite) TestImportBadURL(c *check.C) {
 | 
						|
	out, _, err := dockerCmdWithError("import", "http://nourl/bad")
 | 
						|
	c.Assert(err, checker.NotNil, check.Commentf("import was supposed to fail but didn't"))
 | 
						|
	// Depending on your system you can get either of these errors
 | 
						|
	if !strings.Contains(out, "dial tcp") &&
 | 
						|
		!strings.Contains(out, "ApplyLayer exit status 1 stdout:  stderr: archive/tar: invalid tar header") &&
 | 
						|
		!strings.Contains(out, "Error processing tar file") {
 | 
						|
		c.Fatalf("expected an error msg but didn't get one.\nErr: %v\nOut: %v", err, out)
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
func (s *DockerSuite) TestImportFile(c *check.C) {
 | 
						|
	testRequires(c, DaemonIsLinux)
 | 
						|
	dockerCmd(c, "run", "--name", "test-import", "busybox", "true")
 | 
						|
 | 
						|
	temporaryFile, err := ioutil.TempFile("", "exportImportTest")
 | 
						|
	c.Assert(err, checker.IsNil, check.Commentf("failed to create temporary file"))
 | 
						|
	defer os.Remove(temporaryFile.Name())
 | 
						|
 | 
						|
	runCmd := exec.Command(dockerBinary, "export", "test-import")
 | 
						|
	runCmd.Stdout = bufio.NewWriter(temporaryFile)
 | 
						|
 | 
						|
	_, err = runCommand(runCmd)
 | 
						|
	c.Assert(err, checker.IsNil, check.Commentf("failed to export a container"))
 | 
						|
 | 
						|
	out, _ := dockerCmd(c, "import", temporaryFile.Name())
 | 
						|
	c.Assert(out, checker.Count, "\n", 1, check.Commentf("display is expected 1 '\\n' but didn't"))
 | 
						|
	image := strings.TrimSpace(out)
 | 
						|
 | 
						|
	out, _ = dockerCmd(c, "run", "--rm", image, "true")
 | 
						|
	c.Assert(out, checker.Equals, "", check.Commentf("command output should've been nothing."))
 | 
						|
}
 | 
						|
 | 
						|
func (s *DockerSuite) TestImportGzipped(c *check.C) {
 | 
						|
	testRequires(c, DaemonIsLinux)
 | 
						|
	dockerCmd(c, "run", "--name", "test-import", "busybox", "true")
 | 
						|
 | 
						|
	temporaryFile, err := ioutil.TempFile("", "exportImportTest")
 | 
						|
	c.Assert(err, checker.IsNil, check.Commentf("failed to create temporary file"))
 | 
						|
	defer os.Remove(temporaryFile.Name())
 | 
						|
 | 
						|
	runCmd := exec.Command(dockerBinary, "export", "test-import")
 | 
						|
	w := gzip.NewWriter(temporaryFile)
 | 
						|
	runCmd.Stdout = w
 | 
						|
 | 
						|
	_, err = runCommand(runCmd)
 | 
						|
	c.Assert(err, checker.IsNil, check.Commentf("failed to export a container"))
 | 
						|
	err = w.Close()
 | 
						|
	c.Assert(err, checker.IsNil, check.Commentf("failed to close gzip writer"))
 | 
						|
	temporaryFile.Close()
 | 
						|
	out, _ := dockerCmd(c, "import", temporaryFile.Name())
 | 
						|
	c.Assert(out, checker.Count, "\n", 1, check.Commentf("display is expected 1 '\\n' but didn't"))
 | 
						|
	image := strings.TrimSpace(out)
 | 
						|
 | 
						|
	out, _ = dockerCmd(c, "run", "--rm", image, "true")
 | 
						|
	c.Assert(out, checker.Equals, "", check.Commentf("command output should've been nothing."))
 | 
						|
}
 | 
						|
 | 
						|
func (s *DockerSuite) TestImportFileWithMessage(c *check.C) {
 | 
						|
	testRequires(c, DaemonIsLinux)
 | 
						|
	dockerCmd(c, "run", "--name", "test-import", "busybox", "true")
 | 
						|
 | 
						|
	temporaryFile, err := ioutil.TempFile("", "exportImportTest")
 | 
						|
	c.Assert(err, checker.IsNil, check.Commentf("failed to create temporary file"))
 | 
						|
	defer os.Remove(temporaryFile.Name())
 | 
						|
 | 
						|
	runCmd := exec.Command(dockerBinary, "export", "test-import")
 | 
						|
	runCmd.Stdout = bufio.NewWriter(temporaryFile)
 | 
						|
 | 
						|
	_, err = runCommand(runCmd)
 | 
						|
	c.Assert(err, checker.IsNil, check.Commentf("failed to export a container"))
 | 
						|
 | 
						|
	message := "Testing commit message"
 | 
						|
	out, _ := dockerCmd(c, "import", "-m", message, temporaryFile.Name())
 | 
						|
	c.Assert(out, checker.Count, "\n", 1, check.Commentf("display is expected 1 '\\n' but didn't"))
 | 
						|
	image := strings.TrimSpace(out)
 | 
						|
 | 
						|
	out, _ = dockerCmd(c, "history", image)
 | 
						|
	split := strings.Split(out, "\n")
 | 
						|
 | 
						|
	c.Assert(split, checker.HasLen, 3, check.Commentf("expected 3 lines from image history"))
 | 
						|
	r := regexp.MustCompile("[\\s]{2,}")
 | 
						|
	split = r.Split(split[1], -1)
 | 
						|
 | 
						|
	c.Assert(message, checker.Equals, split[3], check.Commentf("didn't get expected value in commit message"))
 | 
						|
 | 
						|
	out, _ = dockerCmd(c, "run", "--rm", image, "true")
 | 
						|
	c.Assert(out, checker.Equals, "", check.Commentf("command output should've been nothing"))
 | 
						|
}
 | 
						|
 | 
						|
func (s *DockerSuite) TestImportFileNonExistentFile(c *check.C) {
 | 
						|
	_, _, err := dockerCmdWithError("import", "example.com/myImage.tar")
 | 
						|
	c.Assert(err, checker.NotNil, check.Commentf("import non-existing file must failed"))
 | 
						|
}
 | 
						|
 | 
						|
func (s *DockerSuite) TestImportWithQuotedChanges(c *check.C) {
 | 
						|
	testRequires(c, DaemonIsLinux)
 | 
						|
	dockerCmd(c, "run", "--name", "test-import", "busybox", "true")
 | 
						|
 | 
						|
	temporaryFile, err := ioutil.TempFile("", "exportImportTest")
 | 
						|
	c.Assert(err, checker.IsNil, check.Commentf("failed to create temporary file"))
 | 
						|
	defer os.Remove(temporaryFile.Name())
 | 
						|
 | 
						|
	result := icmd.RunCmd(icmd.Cmd{
 | 
						|
		Command: binaryWithArgs("export", "test-import"),
 | 
						|
		Stdout:  bufio.NewWriter(temporaryFile),
 | 
						|
	})
 | 
						|
	c.Assert(result, icmd.Matches, icmd.Success)
 | 
						|
 | 
						|
	result = dockerCmdWithResult("import", "-c", `ENTRYPOINT ["/bin/sh", "-c"]`, temporaryFile.Name())
 | 
						|
	c.Assert(result, icmd.Matches, icmd.Success)
 | 
						|
	image := strings.TrimSpace(result.Stdout())
 | 
						|
 | 
						|
	result = dockerCmdWithResult("run", "--rm", image, "true")
 | 
						|
	c.Assert(result, icmd.Matches, icmd.Expected{Out: icmd.None})
 | 
						|
}
 |