e2707394d0
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> Upstream-commit: a79a27412d721a042ae96b411ab1b5b926a7d28a Component: engine
89 lines
2.0 KiB
Go
89 lines
2.0 KiB
Go
package image
|
|
|
|
import (
|
|
"io"
|
|
"os"
|
|
|
|
"golang.org/x/net/context"
|
|
|
|
"github.com/docker/docker/api/client"
|
|
"github.com/docker/docker/cli"
|
|
dockeropts "github.com/docker/docker/opts"
|
|
"github.com/docker/docker/pkg/jsonmessage"
|
|
"github.com/docker/docker/pkg/urlutil"
|
|
"github.com/docker/engine-api/types"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
type importOptions struct {
|
|
source string
|
|
reference string
|
|
changes dockeropts.ListOpts
|
|
message string
|
|
}
|
|
|
|
// NewImportCommand creates a new `docker import` command
|
|
func NewImportCommand(dockerCli *client.DockerCli) *cobra.Command {
|
|
var opts importOptions
|
|
|
|
cmd := &cobra.Command{
|
|
Use: "import [OPTIONS] file|URL|- [REPOSITORY[:TAG]]",
|
|
Short: "Import the contents from a tarball to create a filesystem image",
|
|
Args: cli.RequiresMinArgs(1),
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
opts.source = args[0]
|
|
if len(args) > 1 {
|
|
opts.reference = args[1]
|
|
}
|
|
return runImport(dockerCli, opts)
|
|
},
|
|
}
|
|
|
|
flags := cmd.Flags()
|
|
|
|
opts.changes = dockeropts.NewListOpts(nil)
|
|
flags.VarP(&opts.changes, "change", "c", "Apply Dockerfile instruction to the created image")
|
|
flags.StringVarP(&opts.message, "message", "m", "", "Set commit message for imported image")
|
|
|
|
return cmd
|
|
}
|
|
|
|
func runImport(dockerCli *client.DockerCli, opts importOptions) error {
|
|
var (
|
|
in io.Reader
|
|
srcName = opts.source
|
|
)
|
|
|
|
if opts.source == "-" {
|
|
in = dockerCli.In()
|
|
} else if !urlutil.IsURL(opts.source) {
|
|
srcName = "-"
|
|
file, err := os.Open(opts.source)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer file.Close()
|
|
in = file
|
|
}
|
|
|
|
source := types.ImageImportSource{
|
|
Source: in,
|
|
SourceName: srcName,
|
|
}
|
|
|
|
options := types.ImageImportOptions{
|
|
Message: opts.message,
|
|
Changes: opts.changes.GetAll(),
|
|
}
|
|
|
|
clnt := dockerCli.Client()
|
|
|
|
responseBody, err := clnt.ImageImport(context.Background(), source, opts.reference, options)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer responseBody.Close()
|
|
|
|
return jsonmessage.DisplayJSONMessagesStream(responseBody, dockerCli.Out(), dockerCli.OutFd(), dockerCli.IsTerminalOut(), nil)
|
|
}
|