mirror of
https://github.com/containers/podman.git
synced 2025-10-28 11:55:06 +08:00
The new golangci-lint version 1.60.1 has problems with typecheck when linting remote files. We have certain pakcages that should never be inlcuded in remote but the typecheck tries to compile all of them but this never works and it seems to ignore the exclude files we gave it. To fix this the proper way is to mark all packages we only use locally with !remote tags. This is a bit ugly but more correct. I also moved the DecodeChanges() code around as it is called from the client so the handles package which should only be remote doesn't really fit anyway. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
126 lines
4.7 KiB
Go
126 lines
4.7 KiB
Go
package containers
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/containers/common/pkg/completion"
|
|
"github.com/containers/podman/v5/cmd/podman/common"
|
|
"github.com/containers/podman/v5/cmd/podman/registry"
|
|
"github.com/containers/podman/v5/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(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
|
|
}
|