mirror of
https://github.com/podman-container-tools/podman.git
synced 2026-08-05 16:35:45 +00:00
When committing containers to create new images, accept a container config blob being passed in the body of the API request by adding a Config field to our API structures. Populate it from the body of requests that we receive, and use its contents as the body of requests that we make. Make the libpod commit endpoint split changes values at newlines, just like the compat endpoint does. Pass both the config blob and the "changes" slice to buildah's Commit() API, so that it can handle cases where they overlap or conflict. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
129 lines
4.9 KiB
Go
129 lines
4.9 KiB
Go
package containers
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/containers/common/pkg/completion"
|
|
"github.com/containers/podman/v4/cmd/podman/common"
|
|
"github.com/containers/podman/v4/cmd/podman/registry"
|
|
"github.com/containers/podman/v4/pkg/api/handlers"
|
|
"github.com/containers/podman/v4/pkg/domain/entities"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
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 [options] CONTAINER [IMAGE]",
|
|
Short: "Create new image based on the changed container",
|
|
Long: commitDescription,
|
|
RunE: commit,
|
|
Args: cobra.RangeArgs(1, 2),
|
|
ValidArgsFunction: common.AutocompleteCommitCommand,
|
|
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 containerID`,
|
|
}
|
|
|
|
containerCommitCommand = &cobra.Command{
|
|
Args: commitCommand.Args,
|
|
Use: commitCommand.Use,
|
|
Short: commitCommand.Short,
|
|
Long: commitCommand.Long,
|
|
RunE: commitCommand.RunE,
|
|
ValidArgsFunction: commitCommand.ValidArgsFunction,
|
|
Example: `podman container commit -q --message "committing container to image" reverent_golick image-committed
|
|
podman container commit -q --author "firstName lastName" reverent_golick image-committed
|
|
podman container commit -q --pause=false containerID image-committed
|
|
podman container commit containerID`,
|
|
}
|
|
)
|
|
|
|
var (
|
|
commitOptions = entities.CommitOptions{
|
|
ImageName: "",
|
|
}
|
|
configFile, iidFile string
|
|
)
|
|
|
|
func commitFlags(cmd *cobra.Command) {
|
|
flags := cmd.Flags()
|
|
|
|
changeFlagName := "change"
|
|
flags.StringArrayVarP(&commitOptions.Changes, changeFlagName, "c", []string{}, "Apply the following possible instructions to the created image (default []): "+strings.Join(common.ChangeCmds, " | "))
|
|
_ = cmd.RegisterFlagCompletionFunc(changeFlagName, common.AutocompleteChangeInstructions)
|
|
|
|
configFileFlagName := "config"
|
|
flags.StringVar(&configFile, configFileFlagName, "", "`file` containing a container configuration to merge into the image")
|
|
_ = cmd.RegisterFlagCompletionFunc(configFileFlagName, completion.AutocompleteDefault)
|
|
|
|
formatFlagName := "format"
|
|
flags.StringVarP(&commitOptions.Format, formatFlagName, "f", "oci", "`Format` of the image manifest and metadata")
|
|
_ = cmd.RegisterFlagCompletionFunc(formatFlagName, common.AutocompleteImageFormat)
|
|
|
|
iidFileFlagName := "iidfile"
|
|
flags.StringVarP(&iidFile, iidFileFlagName, "", "", "`file` to write the image ID to")
|
|
_ = cmd.RegisterFlagCompletionFunc(iidFileFlagName, completion.AutocompleteDefault)
|
|
|
|
messageFlagName := "message"
|
|
flags.StringVarP(&commitOptions.Message, messageFlagName, "m", "", "Set commit message for imported image")
|
|
_ = cmd.RegisterFlagCompletionFunc(messageFlagName, completion.AutocompleteNone)
|
|
|
|
authorFlagName := "author"
|
|
flags.StringVarP(&commitOptions.Author, authorFlagName, "a", "", "Set the author for the image committed")
|
|
_ = cmd.RegisterFlagCompletionFunc(authorFlagName, completion.AutocompleteNone)
|
|
|
|
flags.BoolVarP(&commitOptions.Pause, "pause", "p", false, "Pause container during commit")
|
|
flags.BoolVarP(&commitOptions.Quiet, "quiet", "q", false, "Suppress output")
|
|
flags.BoolVarP(&commitOptions.Squash, "squash", "s", false, "squash newly built layers into a single new layer")
|
|
flags.BoolVar(&commitOptions.IncludeVolumes, "include-volumes", false, "Include container volumes as image volumes")
|
|
}
|
|
|
|
func init() {
|
|
registry.Commands = append(registry.Commands, registry.CliCommand{
|
|
Command: commitCommand,
|
|
})
|
|
commitFlags(commitCommand)
|
|
|
|
registry.Commands = append(registry.Commands, registry.CliCommand{
|
|
Command: containerCommitCommand,
|
|
Parent: containerCmd,
|
|
})
|
|
commitFlags(containerCommitCommand)
|
|
}
|
|
|
|
func commit(cmd *cobra.Command, args []string) error {
|
|
container := strings.TrimPrefix(args[0], "/")
|
|
if len(args) == 2 {
|
|
commitOptions.ImageName = args[1]
|
|
}
|
|
if !commitOptions.Quiet {
|
|
commitOptions.Writer = os.Stderr
|
|
}
|
|
if len(commitOptions.Changes) > 0 {
|
|
commitOptions.Changes = handlers.DecodeChanges(commitOptions.Changes)
|
|
}
|
|
if len(configFile) > 0 {
|
|
cfg, err := os.ReadFile(configFile)
|
|
if err != nil {
|
|
return fmt.Errorf("--config: %w", err)
|
|
}
|
|
commitOptions.Config = cfg
|
|
}
|
|
response, err := registry.ContainerEngine().ContainerCommit(context.Background(), container, commitOptions)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if len(iidFile) > 0 {
|
|
if err = os.WriteFile(iidFile, []byte(response.Id), 0644); err != nil {
|
|
return fmt.Errorf("failed to write image ID: %w", err)
|
|
}
|
|
}
|
|
fmt.Println(response.Id)
|
|
return nil
|
|
}
|