diff options
Diffstat (limited to 'cmd/podman/commit.go')
| -rw-r--r-- | cmd/podman/commit.go | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/cmd/podman/commit.go b/cmd/podman/commit.go index e98b71514..3ad3bd275 100644 --- a/cmd/podman/commit.go +++ b/cmd/podman/commit.go @@ -2,11 +2,11 @@ package main import ( "fmt" + "io/ioutil" "strings" "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/pkg/adapter" - "github.com/containers/libpod/pkg/util" "github.com/pkg/errors" "github.com/spf13/cobra" ) @@ -16,7 +16,7 @@ var ( commitDescription = `Create an image from a container's changes. Optionally tag the image created, set the author with the --author flag, set the commit message with the --message flag, and make changes to the instructions with the --change flag.` _commitCommand = &cobra.Command{ - Use: "commit [flags] CONTAINER IMAGE", + Use: "commit [flags] CONTAINER [IMAGE]", Short: "Create new image based on the changed container", Long: commitDescription, RunE: func(cmd *cobra.Command, args []string) error { @@ -27,7 +27,8 @@ var ( }, Example: `podman commit -q --message "committing container to image" reverent_golick image-committed podman commit -q --author "firstName lastName" reverent_golick image-committed - podman commit -q --pause=false containerID image-committed`, + podman commit -q --pause=false containerID image-committed + podman commit containerID`, } // ChangeCmds is the list of valid Changes commands to passed to the Commit call @@ -41,6 +42,7 @@ func init() { flags := commitCommand.Flags() flags.StringArrayVarP(&commitCommand.Change, "change", "c", []string{}, fmt.Sprintf("Apply the following possible instructions to the created image (default []): %s", strings.Join(ChangeCmds, " | "))) flags.StringVarP(&commitCommand.Format, "format", "f", "oci", "`Format` of the image manifest and metadata") + flags.StringVarP(&commitCommand.ImageIDFile, "iidfile", "", "", "`file` to write the image ID to") flags.StringVarP(&commitCommand.Message, "message", "m", "", "Set commit message for imported image") flags.StringVarP(&commitCommand.Author, "author", "a", "", "Set the author for the image committed") flags.BoolVarP(&commitCommand.Pause, "pause", "p", false, "Pause container during commit") @@ -56,28 +58,25 @@ func commitCmd(c *cliconfig.CommitValues) error { defer runtime.DeferredShutdown(false) args := c.InputArgs - if len(args) != 2 { - return errors.Errorf("you must provide a container name or ID and a target image name") + if len(args) < 1 { + return errors.Errorf("you must provide a container name or ID and optionally a target image name") } container := args[0] - reference := args[1] - if c.Flag("change").Changed { - for _, change := range c.Change { - splitChange := strings.Split(strings.ToUpper(change), "=") - if len(splitChange) == 1 { - splitChange = strings.Split(strings.ToUpper(change), " ") - } - if !util.StringInSlice(splitChange[0], ChangeCmds) { - return errors.Errorf("invalid syntax for --change: %s", change) - } - } + reference := "" + if len(args) > 1 { + reference = args[1] } iid, err := runtime.Commit(getContext(), c, container, reference) if err != nil { return err } + if c.ImageIDFile != "" { + if err = ioutil.WriteFile(c.ImageIDFile, []byte(iid), 0644); err != nil { + return errors.Wrapf(err, "failed to write image ID to file %q", c.ImageIDFile) + } + } fmt.Println(iid) return nil } |