Use buildah commit and bud in podman

Vendor in buildah and use as much of commit and bug as possible for podman
build and commit.

Resolves #586
Signed-off-by: baude <bbaude@redhat.com>

Closes: #681
Approved by: mheon

3 files changed, 665 insertions, 740 deletions

diff --git a/cmd/podman/build.go b/cmd/podman/build.go
index 92823f72b..180b43cbc 100644
--- a/cmd/podman/build.go
+++ b/cmd/podman/build.go
@@ -1,270 +1,176 @@
 package main
 
 import (
-	"fmt"
 	"os"
-	"os/exec"
-	"strconv"
+	"path/filepath"
+	"strings"
 
 	"github.com/pkg/errors"
+	"github.com/projectatomic/buildah/imagebuildah"
+	buildahcli "github.com/projectatomic/buildah/pkg/cli"
+	"github.com/projectatomic/buildah/pkg/parse"
+	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
+	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
 
 var (
-	buildFlags = []cli.Flag{
-		// The following flags are emulated from:
-		// src/github.com/projectatomic/buildah/cmd/bud.go
-		cli.StringFlag{
-			Name:  "authfile",
-			Usage: "path of the authentication file. Default is ${XDG_RUNTIME_DIR}/containers/auth.json",
-		},
-		cli.StringSliceFlag{
-			Name:  "build-arg",
-			Usage: "`argument=value` to supply to the builder",
-		},
-		cli.StringFlag{
-			Name:  "cert-dir",
-			Value: "",
-			Usage: "use certificates at the specified path to access the registry",
-		},
-		cli.StringFlag{
-			Name:  "creds",
-			Value: "",
-			Usage: "use `[username[:password]]` for accessing the registry",
-		},
-		cli.StringSliceFlag{
-			Name:  "file, f",
-			Usage: "`pathname or URL` of a Dockerfile",
-		},
-		cli.StringFlag{
-			Name:  "format",
-			Usage: "`format` of the built image's manifest and metadata",
-		},
-		cli.BoolFlag{
-			Name:  "pull-always",
-			Usage: "pull the image, even if a version is present",
-		},
-		cli.BoolFlag{
-			Name:  "quiet, q",
-			Usage: "refrain from announcing build instructions and image read/write progress",
-		},
-		cli.StringFlag{
-			Name:  "runtime",
-			Usage: "`path` to an alternate runtime",
-		},
-		cli.StringSliceFlag{
-			Name:  "runtime-flag",
-			Usage: "add global flags for the container runtime",
-		},
-		cli.StringFlag{
-			Name:  "signature-policy",
-			Usage: "`pathname` of signature policy file (not usually used)",
-		},
-		cli.StringSliceFlag{
-			Name:  "tag, t",
-			Usage: "`tag` to apply to the built image",
-		},
-		cli.BoolFlag{
-			Name:  "tls-verify",
-			Usage: "require HTTPS and verify certificates when accessing the registry",
-		},
-		// The following flags are emulated from:
-		// src/github.com/projectatomic/buildah/cmd/common.go fromAndBudFlags
-		cli.StringSliceFlag{
-			Name:  "add-host",
-			Usage: "add a custom host-to-IP mapping (host:ip) (default [])",
-		},
-		cli.StringFlag{
-			Name:  "cgroup-parent",
-			Usage: "optional parent cgroup for the container",
-		},
-		cli.Uint64Flag{
-			Name:  "cpu-period",
-			Usage: "limit the CPU CFS (Completely Fair Scheduler) period",
-		},
-		cli.Int64Flag{
-			Name:  "cpu-quota",
-			Usage: "limit the CPU CFS (Completely Fair Scheduler) quota",
-		},
-		cli.Uint64Flag{
-			Name:  "cpu-shares",
-			Usage: "CPU shares (relative weight)",
-		},
-		cli.StringFlag{
-			Name:  "cpuset-cpus",
-			Usage: "CPUs in which to allow execution (0-3, 0,1)",
-		},
-		cli.StringFlag{
-			Name:  "cpuset-mems",
-			Usage: "memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems.",
-		},
-		cli.StringFlag{
-			Name:  "memory, m",
-			Usage: "memory limit (format: <number>[<unit>], where unit = b, k, m or g)",
-		},
-		cli.StringFlag{
-			Name:  "memory-swap",
-			Usage: "swap limit equal to memory plus swap: '-1' to enable unlimited swap",
-		},
-		cli.StringSliceFlag{
-			Name:  "security-opt",
-			Usage: "security Options (default [])",
-		},
-		cli.StringFlag{
-			Name:  "shm-size",
-			Usage: "size of `/dev/shm`. The format is `<number><unit>`.",
-			Value: "65536k",
-		},
-		cli.StringSliceFlag{
-			Name:  "ulimit",
-			Usage: "ulimit options (default [])",
-		},
-		cli.StringSliceFlag{
-			Name:  "volume, v",
-			Usage: "bind mount a volume into the container (default [])",
-		},
-	}
 	buildDescription = "podman build launches the Buildah command to build an OCI Image. Buildah must be installed for this command to work."
 	buildCommand     = cli.Command{
-		Name:        "build",
-		Usage:       "Build an image using instructions in a Dockerfile",
-		Description: buildDescription,
-		Flags:       buildFlags,
-		Action:      buildCmd,
-		ArgsUsage:   "CONTEXT-DIRECTORY | URL",
+		Name:           "build",
+		Usage:          "Build an image using instructions in a Dockerfile",
+		Description:    buildDescription,
+		Flags:          append(buildahcli.BudFlags, buildahcli.FromAndBudFlags...),
+		Action:         buildCmd,
+		ArgsUsage:      "CONTEXT-DIRECTORY | URL",
+		SkipArgReorder: true,
 	}
 )
 
 func buildCmd(c *cli.Context) error {
-
-	budCmdArgs := []string{}
-
-	// Handle Global Options
-	logLevel := c.GlobalString("log-level")
-	if logLevel == "debug" {
-		budCmdArgs = append(budCmdArgs, "--debug")
-	}
-	if c.GlobalIsSet("root") {
-		budCmdArgs = append(budCmdArgs, "--root", c.GlobalString("root"))
-	}
-	if c.GlobalIsSet("runroot") {
-		budCmdArgs = append(budCmdArgs, "--runroot", c.GlobalString("runroot"))
-	}
-	if c.GlobalIsSet("storage-driver") {
-		budCmdArgs = append(budCmdArgs, "--storage-driver", c.GlobalString("storage-driver"))
-	}
-	for _, storageOpt := range c.GlobalStringSlice("storage-opt") {
-		budCmdArgs = append(budCmdArgs, "--storage-opt", storageOpt)
-	}
-
-	budCmdArgs = append(budCmdArgs, "bud")
-
-	// Buildah bud specific options
-	if c.IsSet("authfile") {
-		budCmdArgs = append(budCmdArgs, "--authfile", c.String("authfile"))
-	}
-	for _, buildArg := range c.StringSlice("build-arg") {
-		budCmdArgs = append(budCmdArgs, "--build-arg", buildArg)
-	}
-	if c.IsSet("cert-dir") {
-		budCmdArgs = append(budCmdArgs, "--cert-dir", c.String("cert-dir"))
-	}
-	if c.IsSet("creds") {
-		budCmdArgs = append(budCmdArgs, "--creds", c.String("creds"))
-	}
-	for _, fileName := range c.StringSlice("file") {
-		budCmdArgs = append(budCmdArgs, "--file", fileName)
-	}
+	// The following was taken directly from projectatomic/buildah/cmd/bud.go
+	// TODO Find a away to vendor more of this in rather than copy from bud
+	output := ""
+	tags := []string{}
+	if c.IsSet("tag") || c.IsSet("t") {
+		tags = c.StringSlice("tag")
+		if len(tags) > 0 {
+			output = tags[0]
+			tags = tags[1:]
+		}
+	}
+	pullPolicy := imagebuildah.PullNever
+	if c.BoolT("pull") {
+		pullPolicy = imagebuildah.PullIfMissing
+	}
+	if c.Bool("pull-always") {
+		pullPolicy = imagebuildah.PullAlways
+	}
+
+	args := make(map[string]string)
+	if c.IsSet("build-arg") {
+		for _, arg := range c.StringSlice("build-arg") {
+			av := strings.SplitN(arg, "=", 2)
+			if len(av) > 1 {
+				args[av[0]] = av[1]
+			} else {
+				delete(args, av[0])
+			}
+		}
+	}
+
+	dockerfiles := c.StringSlice("file")
+	format := "oci"
 	if c.IsSet("format") {
-		budCmdArgs = append(budCmdArgs, "--format", c.String("format"))
-	}
-	if c.IsSet("pull-always") {
-		budCmdArgs = append(budCmdArgs, "--pull-always")
-	}
-	if c.IsSet("quiet") {
-		quietParam := "--quiet=" + strconv.FormatBool(c.Bool("quiet"))
-		budCmdArgs = append(budCmdArgs, quietParam)
-	}
-	if c.IsSet("runtime") {
-		budCmdArgs = append(budCmdArgs, "--runtime", c.String("runtime"))
-	}
-	for _, runtimeArg := range c.StringSlice("runtime-flag") {
-		budCmdArgs = append(budCmdArgs, "--runtime-flag", runtimeArg)
-	}
-	if c.IsSet("signature-policy") {
-		budCmdArgs = append(budCmdArgs, "--signature-policy", c.String("signature-policy"))
-	}
-	for _, tagArg := range c.StringSlice("tag") {
-		budCmdArgs = append(budCmdArgs, "--tag", tagArg)
-	}
-	if c.IsSet("tls-verify") {
-		tlsParam := "--tls-verify=" + strconv.FormatBool(c.Bool("tls-verify"))
-		budCmdArgs = append(budCmdArgs, tlsParam)
-	}
-
-	// Buildah bud and from options from cmd/buildah/common.go
-	for _, addHostArg := range c.StringSlice("add-host") {
-		budCmdArgs = append(budCmdArgs, "--add-host", addHostArg)
-	}
-	if c.IsSet("cgroup-parent") {
-		budCmdArgs = append(budCmdArgs, "--cgroup-parent", c.String("cgroup-parent"))
-	}
-	if c.IsSet("cpu-period") {
-		budCmdArgs = append(budCmdArgs, "--cpu-period", fmt.Sprintf("%v", c.Int64("cpu-period")))
-	}
-	if c.IsSet("cpu-quota") {
-		budCmdArgs = append(budCmdArgs, "--cpu-quota", fmt.Sprintf("%v", c.Uint64("cpu-quota")))
-	}
-	if c.IsSet("cpu-shares") {
-		budCmdArgs = append(budCmdArgs, "--cpu-shares", fmt.Sprintf("%v", c.Uint64("cpu-shares")))
-	}
-	if c.IsSet("cpuset-cpus") {
-		budCmdArgs = append(budCmdArgs, "--cpuset-cpus", c.String("cpuset-cpus"))
-	}
-	if c.IsSet("cpuset-mems") {
-		budCmdArgs = append(budCmdArgs, "--cpuset-mems", c.String("cpuset-mems"))
-	}
-	if c.IsSet("memory") {
-		budCmdArgs = append(budCmdArgs, "--memory", c.String("memory"))
-	}
-	if c.IsSet("memory-swap") {
-		budCmdArgs = append(budCmdArgs, "--memory-swap", c.String("memory-swap"))
-	}
-	for _, securityOptArg := range c.StringSlice("security-opt") {
-		budCmdArgs = append(budCmdArgs, "--security-opt", securityOptArg)
-	}
-	if c.IsSet("shm-size") {
-		budCmdArgs = append(budCmdArgs, "--shm-size", c.String("shm-size"))
-	}
-	for _, ulimitArg := range c.StringSlice("ulimit") {
-		budCmdArgs = append(budCmdArgs, "--ulimit", ulimitArg)
-	}
-	for _, volumeArg := range c.StringSlice("volume") {
-		budCmdArgs = append(budCmdArgs, "--volume", volumeArg)
-	}
-
-	if len(c.Args()) > 0 {
-		budCmdArgs = append(budCmdArgs, c.Args()...)
-	}
-
-	buildah := "buildah"
-
-	if _, err := exec.LookPath(buildah); err != nil {
-		return errors.Wrapf(err, "buildah not found in PATH")
-	}
-	if _, err := exec.Command(buildah).Output(); err != nil {
-		return errors.Wrapf(err, "buildah is not operational on this server")
-	}
-
-	cmd := exec.Command(buildah, budCmdArgs...)
-
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-
-	if err := cmd.Run(); err != nil {
-		return errors.Wrapf(err, "error running the buildah build-using-dockerfile (bud) command")
-	}
-
-	return nil
+		format = strings.ToLower(c.String("format"))
+	}
+	if strings.HasPrefix(format, "oci") {
+		format = imagebuildah.OCIv1ImageFormat
+	} else if strings.HasPrefix(format, "docker") {
+		format = imagebuildah.Dockerv2ImageFormat
+	} else {
+		return errors.Errorf("unrecognized image type %q", format)
+	}
+	contextDir := ""
+	cliArgs := c.Args()
+	if len(cliArgs) > 0 {
+		// The context directory could be a URL.  Try to handle that.
+		tempDir, subDir, err := imagebuildah.TempDirForURL("", "buildah", cliArgs[0])
+		if err != nil {
+			return errors.Wrapf(err, "error prepping temporary context directory")
+		}
+		if tempDir != "" {
+			// We had to download it to a temporary directory.
+			// Delete it later.
+			defer func() {
+				if err = os.RemoveAll(tempDir); err != nil {
+					logrus.Errorf("error removing temporary directory %q: %v", contextDir, err)
+				}
+			}()
+			contextDir = filepath.Join(tempDir, subDir)
+		} else {
+			// Nope, it was local.  Use it as is.
+			absDir, err := filepath.Abs(cliArgs[0])
+			if err != nil {
+				return errors.Wrapf(err, "error determining path to directory %q", cliArgs[0])
+			}
+			contextDir = absDir
+		}
+		cliArgs = cliArgs.Tail()
+	} else {
+		// No context directory or URL was specified.  Try to use the
+		// home of the first locally-available Dockerfile.
+		for i := range dockerfiles {
+			if strings.HasPrefix(dockerfiles[i], "http://") ||
+				strings.HasPrefix(dockerfiles[i], "https://") ||
+				strings.HasPrefix(dockerfiles[i], "git://") ||
+				strings.HasPrefix(dockerfiles[i], "github.com/") {
+				continue
+			}
+			absFile, err := filepath.Abs(dockerfiles[i])
+			if err != nil {
+				return errors.Wrapf(err, "error determining path to file %q", dockerfiles[i])
+			}
+			contextDir = filepath.Dir(absFile)
+			dockerfiles[i], err = filepath.Rel(contextDir, absFile)
+			if err != nil {
+				return errors.Wrapf(err, "error determining path to file %q", dockerfiles[i])
+			}
+			break
+		}
+	}
+	if contextDir == "" {
+		return errors.Errorf("no context directory specified, and no dockerfile specified")
+	}
+	if len(dockerfiles) == 0 {
+		dockerfiles = append(dockerfiles, filepath.Join(contextDir, "Dockerfile"))
+	}
+	if err := parse.ValidateFlags(c, buildahcli.BudFlags); err != nil {
+		return err
+	}
+
+	runtimeFlags := []string{}
+	for _, arg := range c.StringSlice("runtime-flag") {
+		runtimeFlags = append(runtimeFlags, "--"+arg)
+	}
+	// end from buildah
+
+	runtime, err := libpodruntime.GetRuntime(c)
+	if err != nil {
+		return errors.Wrapf(err, "could not get runtime")
+	}
+	defer runtime.Shutdown(false)
+
+	systemContext, err := parse.SystemContextFromOptions(c)
+	if err != nil {
+		return errors.Wrapf(err, "error building system context")
+	}
+
+	commonOpts, err := parse.ParseCommonBuildOptions(c)
+	if err != nil {
+		return err
+	}
+
+	options := imagebuildah.BuildOptions{
+		ContextDirectory:      contextDir,
+		PullPolicy:            pullPolicy,
+		Compression:           imagebuildah.Gzip,
+		Quiet:                 c.Bool("quiet"),
+		SignaturePolicyPath:   c.String("signature-policy"),
+		Args:                  args,
+		Output:                output,
+		AdditionalTags:        tags,
+		Runtime:               c.String("runtime"),
+		RuntimeArgs:           runtimeFlags,
+		OutputFormat:          format,
+		SystemContext:         systemContext,
+		CommonBuildOpts:       commonOpts,
+		DefaultMountsFilePath: c.GlobalString("default-mounts-file"),
+	}
+
+	if !c.Bool("quiet") {
+		options.ReportWriter = os.Stderr
+	}
+
+	return runtime.Build(getContext(), options, dockerfiles...)
 }
diff --git a/cmd/podman/commit.go b/cmd/podman/commit.go
index c721c8700..14b7ddace 100644
--- a/cmd/podman/commit.go
+++ b/cmd/podman/commit.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 
 	"github.com/pkg/errors"
+	"github.com/projectatomic/buildah"
 	"github.com/projectatomic/libpod/cmd/podman/libpodruntime"
 	"github.com/projectatomic/libpod/libpod"
-	"github.com/projectatomic/libpod/libpod/buildah"
 	"github.com/projectatomic/libpod/libpod/image"
 	"github.com/projectatomic/libpod/pkg/util"
 	"github.com/urfave/cli"
@@ -22,6 +22,11 @@ var (
 			Usage: "Apply the following possible instructions to the created image (default []): CMD | ENTRYPOINT | ENV | EXPOSE | LABEL | STOPSIGNAL | USER | VOLUME | WORKDIR",
 		},
 		cli.StringFlag{
+			Name:  "format, f",
+			Usage: "`format` of the image manifest and metadata",
+			Value: "oci",
+		},
+		cli.StringFlag{
 			Name:  "message, m",
 			Usage: "Set commit message for imported image",
 		},
@@ -63,12 +68,25 @@ func commitCmd(c *cli.Context) error {
 	defer runtime.Shutdown(false)
 
 	var (
-		writer io.Writer
+		writer   io.Writer
+		mimeType string
 	)
 	args := c.Args()
 	if len(args) != 2 {
 		return errors.Errorf("you must provide a container name or ID and a target image name")
 	}
+
+	switch c.String("format") {
+	case "oci":
+		mimeType = buildah.OCIv1ImageManifest
+		if c.IsSet("message") {
+			return errors.Errorf("messages cannot be added to the OCIv1 image format.")
+		}
+	case "docker":
+		mimeType = buildah.Dockerv2ImageManifest
+	default:
+		return errors.Errorf("unrecognized image format %q", c.String("format"))
+	}
 	container := args[0]
 	reference := args[1]
 	if c.IsSet("change") {
@@ -90,9 +108,10 @@ func commitCmd(c *cli.Context) error {
 
 	sc := image.GetSystemContext(runtime.GetConfig().SignaturePolicyPath, "", false)
 	coptions := buildah.CommitOptions{
-		SignaturePolicyPath: runtime.GetConfig().SignaturePolicyPath,
-		ReportWriter:        writer,
-		SystemContext:       sc,
+		SignaturePolicyPath:   runtime.GetConfig().SignaturePolicyPath,
+		ReportWriter:          writer,
+		SystemContext:         sc,
+		PreferredManifestType: mimeType,
 	}
 	options := libpod.ContainerCommitOptions{
 		CommitOptions: coptions,
diff --git a/cmd/podman/varlink/ioprojectatomicpodman.go b/cmd/podman/varlink/ioprojectatomicpodman.go
index 41e2b7f29..028af3e57 100644
--- a/cmd/podman/varlink/ioprojectatomicpodman.go
+++ b/cmd/podman/varlink/ioprojectatomicpodman.go
@@ -4,14 +4,6 @@ package ioprojectatomicpodman
 import "github.com/varlink/go/varlink"
 
 // Type declarations
-type Version struct {
-	Version    string `json:"version"`
-	Go_version string `json:"go_version"`
-	Git_commit string `json:"git_commit"`
-	Built      int64  `json:"built"`
-	Os_arch    string `json:"os_arch"`
-}
-
 type NotImplemented struct {
 	Comment string `json:"comment"`
 }
@@ -49,30 +41,42 @@ type ImageSearch struct {
 	Star_count   int64  `json:"star_count"`
 }
 
+type Version struct {
+	Version    string `json:"version"`
+	Go_version string `json:"go_version"`
+	Git_commit string `json:"git_commit"`
+	Built      int64  `json:"built"`
+	Os_arch    string `json:"os_arch"`
+}
+
 // Client method calls and reply readers
-func InspectContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.InspectContainer", nil, more__, oneway__)
+func PullImage(c__ *varlink.Connection, more__ bool, oneway__ bool, name_ string) error {
+	var in struct {
+		Name string `json:"name"`
+	}
+	in.Name = name_
+	return c__.Send("io.projectatomic.podman.PullImage", in, more__, oneway__)
 }
 
-func ReadInspectContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadPullImage_(c__ *varlink.Connection, id_ *string) (bool, error) {
 	var out struct {
-		Notimplemented NotImplemented `json:"notimplemented"`
+		Id string `json:"id"`
 	}
 	continues_, err := c__.Receive(&out)
 	if err != nil {
 		return false, err
 	}
-	if notimplemented_ != nil {
-		*notimplemented_ = out.Notimplemented
+	if id_ != nil {
+		*id_ = out.Id
 	}
 	return continues_, nil
 }
 
-func ListContainerChanges(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.ListContainerChanges", nil, more__, oneway__)
+func AttachToContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.AttachToContainer", nil, more__, oneway__)
 }
 
-func ReadListContainerChanges_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadAttachToContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -86,11 +90,29 @@ func ReadListContainerChanges_(c__ *varlink.Connection, notimplemented_ *NotImpl
 	return continues_, nil
 }
 
-func GetContainerStats(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.GetContainerStats", nil, more__, oneway__)
+func ListImages(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.ListImages", nil, more__, oneway__)
 }
 
-func ReadGetContainerStats_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadListImages_(c__ *varlink.Connection, images_ *[]ImageInList) (bool, error) {
+	var out struct {
+		Images []ImageInList `json:"images"`
+	}
+	continues_, err := c__.Receive(&out)
+	if err != nil {
+		return false, err
+	}
+	if images_ != nil {
+		*images_ = []ImageInList(out.Images)
+	}
+	return continues_, nil
+}
+
+func CreateImage(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.CreateImage", nil, more__, oneway__)
+}
+
+func ReadCreateImage_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -126,57 +148,49 @@ func ReadInspectImage_(c__ *varlink.Connection, image_ *string) (bool, error) {
 	return continues_, nil
 }
 
-func DeleteUnusedImages(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.DeleteUnusedImages", nil, more__, oneway__)
+func PushImage(c__ *varlink.Connection, more__ bool, oneway__ bool, name_ string, tag_ string, tlsverify_ bool) error {
+	var in struct {
+		Name      string `json:"name"`
+		Tag       string `json:"tag"`
+		Tlsverify bool   `json:"tlsverify"`
+	}
+	in.Name = name_
+	in.Tag = tag_
+	in.Tlsverify = tlsverify_
+	return c__.Send("io.projectatomic.podman.PushImage", in, more__, oneway__)
 }
 
-func ReadDeleteUnusedImages_(c__ *varlink.Connection, images_ *[]string) (bool, error) {
-	var out struct {
-		Images []string `json:"images"`
-	}
-	continues_, err := c__.Receive(&out)
+func ReadPushImage_(c__ *varlink.Connection) (bool, error) {
+	continues_, err := c__.Receive(nil)
 	if err != nil {
 		return false, err
 	}
-	if images_ != nil {
-		*images_ = []string(out.Images)
-	}
 	return continues_, nil
 }
 
-func ImportImage(c__ *varlink.Connection, more__ bool, oneway__ bool, source_ string, reference_ string, message_ string, changes_ []string) error {
+func TagImage(c__ *varlink.Connection, more__ bool, oneway__ bool, name_ string, tagged_ string) error {
 	var in struct {
-		Source    string   `json:"source"`
-		Reference string   `json:"reference"`
-		Message   string   `json:"message"`
-		Changes   []string `json:"changes"`
+		Name   string `json:"name"`
+		Tagged string `json:"tagged"`
 	}
-	in.Source = source_
-	in.Reference = reference_
-	in.Message = message_
-	in.Changes = []string(changes_)
-	return c__.Send("io.projectatomic.podman.ImportImage", in, more__, oneway__)
+	in.Name = name_
+	in.Tagged = tagged_
+	return c__.Send("io.projectatomic.podman.TagImage", in, more__, oneway__)
 }
 
-func ReadImportImage_(c__ *varlink.Connection, id_ *string) (bool, error) {
-	var out struct {
-		Id string `json:"id"`
-	}
-	continues_, err := c__.Receive(&out)
+func ReadTagImage_(c__ *varlink.Connection) (bool, error) {
+	continues_, err := c__.Receive(nil)
 	if err != nil {
 		return false, err
 	}
-	if id_ != nil {
-		*id_ = out.Id
-	}
 	return continues_, nil
 }
 
-func ListContainers(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.ListContainers", nil, more__, oneway__)
+func ListContainerChanges(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.ListContainerChanges", nil, more__, oneway__)
 }
 
-func ReadListContainers_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadListContainerChanges_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -190,11 +204,11 @@ func ReadListContainers_(c__ *varlink.Connection, notimplemented_ *NotImplemente
 	return continues_, nil
 }
 
-func AttachToContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.AttachToContainer", nil, more__, oneway__)
+func PauseContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.PauseContainer", nil, more__, oneway__)
 }
 
-func ReadAttachToContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadPauseContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -208,11 +222,11 @@ func ReadAttachToContainer_(c__ *varlink.Connection, notimplemented_ *NotImpleme
 	return continues_, nil
 }
 
-func RemoveContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.RemoveContainer", nil, more__, oneway__)
+func BuildImage(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.BuildImage", nil, more__, oneway__)
 }
 
-func ReadRemoveContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadBuildImage_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -226,11 +240,11 @@ func ReadRemoveContainer_(c__ *varlink.Connection, notimplemented_ *NotImplement
 	return continues_, nil
 }
 
-func KillContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.KillContainer", nil, more__, oneway__)
+func InspectContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.InspectContainer", nil, more__, oneway__)
 }
 
-func ReadKillContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadInspectContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -244,11 +258,11 @@ func ReadKillContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented
 	return continues_, nil
 }
 
-func ResizeContainerTty(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.ResizeContainerTty", nil, more__, oneway__)
+func GetContainerStats(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.GetContainerStats", nil, more__, oneway__)
 }
 
-func ReadResizeContainerTty_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadGetContainerStats_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -262,11 +276,11 @@ func ReadResizeContainerTty_(c__ *varlink.Connection, notimplemented_ *NotImplem
 	return continues_, nil
 }
 
-func StartContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.StartContainer", nil, more__, oneway__)
+func RestartContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.RestartContainer", nil, more__, oneway__)
 }
 
-func ReadStartContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadRestartContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -280,11 +294,11 @@ func ReadStartContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemente
 	return continues_, nil
 }
 
-func StopContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.StopContainer", nil, more__, oneway__)
+func KillContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.KillContainer", nil, more__, oneway__)
 }
 
-func ReadStopContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadKillContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -298,11 +312,11 @@ func ReadStopContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented
 	return continues_, nil
 }
 
-func UnpauseContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.UnpauseContainer", nil, more__, oneway__)
+func WaitContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.WaitContainer", nil, more__, oneway__)
 }
 
-func ReadUnpauseContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadWaitContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -316,20 +330,30 @@ func ReadUnpauseContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemen
 	return continues_, nil
 }
 
-func GetVersion(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.GetVersion", nil, more__, oneway__)
+func ImportImage(c__ *varlink.Connection, more__ bool, oneway__ bool, source_ string, reference_ string, message_ string, changes_ []string) error {
+	var in struct {
+		Source    string   `json:"source"`
+		Reference string   `json:"reference"`
+		Message   string   `json:"message"`
+		Changes   []string `json:"changes"`
+	}
+	in.Source = source_
+	in.Reference = reference_
+	in.Message = message_
+	in.Changes = []string(changes_)
+	return c__.Send("io.projectatomic.podman.ImportImage", in, more__, oneway__)
 }
 
-func ReadGetVersion_(c__ *varlink.Connection, version_ *Version) (bool, error) {
+func ReadImportImage_(c__ *varlink.Connection, id_ *string) (bool, error) {
 	var out struct {
-		Version Version `json:"version"`
+		Id string `json:"id"`
 	}
 	continues_, err := c__.Receive(&out)
 	if err != nil {
 		return false, err
 	}
-	if version_ != nil {
-		*version_ = out.Version
+	if id_ != nil {
+		*id_ = out.Id
 	}
 	return continues_, nil
 }
@@ -352,29 +376,11 @@ func ReadPing_(c__ *varlink.Connection, ping_ *StringResponse) (bool, error) {
 	return continues_, nil
 }
 
-func WaitContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.WaitContainer", nil, more__, oneway__)
-}
-
-func ReadWaitContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
-	var out struct {
-		Notimplemented NotImplemented `json:"notimplemented"`
-	}
-	continues_, err := c__.Receive(&out)
-	if err != nil {
-		return false, err
-	}
-	if notimplemented_ != nil {
-		*notimplemented_ = out.Notimplemented
-	}
-	return continues_, nil
-}
-
-func BuildImage(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.BuildImage", nil, more__, oneway__)
+func CreateContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.CreateContainer", nil, more__, oneway__)
 }
 
-func ReadBuildImage_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadCreateContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -388,66 +394,6 @@ func ReadBuildImage_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (
 	return continues_, nil
 }
 
-func HistoryImage(c__ *varlink.Connection, more__ bool, oneway__ bool, name_ string) error {
-	var in struct {
-		Name string `json:"name"`
-	}
-	in.Name = name_
-	return c__.Send("io.projectatomic.podman.HistoryImage", in, more__, oneway__)
-}
-
-func ReadHistoryImage_(c__ *varlink.Connection, history_ *[]ImageHistory) (bool, error) {
-	var out struct {
-		History []ImageHistory `json:"history"`
-	}
-	continues_, err := c__.Receive(&out)
-	if err != nil {
-		return false, err
-	}
-	if history_ != nil {
-		*history_ = []ImageHistory(out.History)
-	}
-	return continues_, nil
-}
-
-func PushImage(c__ *varlink.Connection, more__ bool, oneway__ bool, name_ string, tag_ string, tlsverify_ bool) error {
-	var in struct {
-		Name      string `json:"name"`
-		Tag       string `json:"tag"`
-		Tlsverify bool   `json:"tlsverify"`
-	}
-	in.Name = name_
-	in.Tag = tag_
-	in.Tlsverify = tlsverify_
-	return c__.Send("io.projectatomic.podman.PushImage", in, more__, oneway__)
-}
-
-func ReadPushImage_(c__ *varlink.Connection) (bool, error) {
-	continues_, err := c__.Receive(nil)
-	if err != nil {
-		return false, err
-	}
-	return continues_, nil
-}
-
-func TagImage(c__ *varlink.Connection, more__ bool, oneway__ bool, name_ string, tagged_ string) error {
-	var in struct {
-		Name   string `json:"name"`
-		Tagged string `json:"tagged"`
-	}
-	in.Name = name_
-	in.Tagged = tagged_
-	return c__.Send("io.projectatomic.podman.TagImage", in, more__, oneway__)
-}
-
-func ReadTagImage_(c__ *varlink.Connection) (bool, error) {
-	continues_, err := c__.Receive(nil)
-	if err != nil {
-		return false, err
-	}
-	return continues_, nil
-}
-
 func SearchImage(c__ *varlink.Connection, more__ bool, oneway__ bool, name_ string, limit_ int64) error {
 	var in struct {
 		Name  string `json:"name"`
@@ -492,11 +438,11 @@ func ReadExportImage_(c__ *varlink.Connection) (bool, error) {
 	return continues_, nil
 }
 
-func RenameContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.RenameContainer", nil, more__, oneway__)
+func ExportContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.ExportContainer", nil, more__, oneway__)
 }
 
-func ReadRenameContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadExportContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -510,29 +456,29 @@ func ReadRenameContainer_(c__ *varlink.Connection, notimplemented_ *NotImplement
 	return continues_, nil
 }
 
-func RemoveImage(c__ *varlink.Connection, more__ bool, oneway__ bool, name_ string, force_ bool) error {
-	var in struct {
-		Name  string `json:"name"`
-		Force bool   `json:"force"`
-	}
-	in.Name = name_
-	in.Force = force_
-	return c__.Send("io.projectatomic.podman.RemoveImage", in, more__, oneway__)
+func RemoveContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.RemoveContainer", nil, more__, oneway__)
 }
 
-func ReadRemoveImage_(c__ *varlink.Connection) (bool, error) {
-	continues_, err := c__.Receive(nil)
+func ReadRemoveContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+	var out struct {
+		Notimplemented NotImplemented `json:"notimplemented"`
+	}
+	continues_, err := c__.Receive(&out)
 	if err != nil {
 		return false, err
 	}
+	if notimplemented_ != nil {
+		*notimplemented_ = out.Notimplemented
+	}
 	return continues_, nil
 }
 
-func ExportContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.ExportContainer", nil, more__, oneway__)
+func CreateFromContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.CreateFromContainer", nil, more__, oneway__)
 }
 
-func ReadExportContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadCreateFromContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -546,11 +492,11 @@ func ReadExportContainer_(c__ *varlink.Connection, notimplemented_ *NotImplement
 	return continues_, nil
 }
 
-func RestartContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.RestartContainer", nil, more__, oneway__)
+func StopContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.StopContainer", nil, more__, oneway__)
 }
 
-func ReadRestartContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadStopContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -564,29 +510,29 @@ func ReadRestartContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemen
 	return continues_, nil
 }
 
-func UpdateContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.UpdateContainer", nil, more__, oneway__)
+func DeleteUnusedImages(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.DeleteUnusedImages", nil, more__, oneway__)
 }
 
-func ReadUpdateContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadDeleteUnusedImages_(c__ *varlink.Connection, images_ *[]string) (bool, error) {
 	var out struct {
-		Notimplemented NotImplemented `json:"notimplemented"`
+		Images []string `json:"images"`
 	}
 	continues_, err := c__.Receive(&out)
 	if err != nil {
 		return false, err
 	}
-	if notimplemented_ != nil {
-		*notimplemented_ = out.Notimplemented
+	if images_ != nil {
+		*images_ = []string(out.Images)
 	}
 	return continues_, nil
 }
 
-func PauseContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.PauseContainer", nil, more__, oneway__)
+func GetContainerLogs(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.GetContainerLogs", nil, more__, oneway__)
 }
 
-func ReadPauseContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadGetContainerLogs_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -600,11 +546,11 @@ func ReadPauseContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemente
 	return continues_, nil
 }
 
-func DeleteStoppedContainers(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.DeleteStoppedContainers", nil, more__, oneway__)
+func UpdateContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.UpdateContainer", nil, more__, oneway__)
 }
 
-func ReadDeleteStoppedContainers_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadUpdateContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -618,11 +564,11 @@ func ReadDeleteStoppedContainers_(c__ *varlink.Connection, notimplemented_ *NotI
 	return continues_, nil
 }
 
-func CreateImage(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.CreateImage", nil, more__, oneway__)
+func RenameContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.RenameContainer", nil, more__, oneway__)
 }
 
-func ReadCreateImage_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadRenameContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -636,11 +582,11 @@ func ReadCreateImage_(c__ *varlink.Connection, notimplemented_ *NotImplemented)
 	return continues_, nil
 }
 
-func CreateFromContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.CreateFromContainer", nil, more__, oneway__)
+func UnpauseContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.UnpauseContainer", nil, more__, oneway__)
 }
 
-func ReadCreateFromContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadUnpauseContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -654,42 +600,60 @@ func ReadCreateFromContainer_(c__ *varlink.Connection, notimplemented_ *NotImple
 	return continues_, nil
 }
 
-func PullImage(c__ *varlink.Connection, more__ bool, oneway__ bool, name_ string) error {
+func HistoryImage(c__ *varlink.Connection, more__ bool, oneway__ bool, name_ string) error {
 	var in struct {
 		Name string `json:"name"`
 	}
 	in.Name = name_
-	return c__.Send("io.projectatomic.podman.PullImage", in, more__, oneway__)
+	return c__.Send("io.projectatomic.podman.HistoryImage", in, more__, oneway__)
 }
 
-func ReadPullImage_(c__ *varlink.Connection, id_ *string) (bool, error) {
+func ReadHistoryImage_(c__ *varlink.Connection, history_ *[]ImageHistory) (bool, error) {
 	var out struct {
-		Id string `json:"id"`
+		History []ImageHistory `json:"history"`
 	}
 	continues_, err := c__.Receive(&out)
 	if err != nil {
 		return false, err
 	}
-	if id_ != nil {
-		*id_ = out.Id
+	if history_ != nil {
+		*history_ = []ImageHistory(out.History)
 	}
 	return continues_, nil
 }
 
-func GetContainerLogs(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.GetContainerLogs", nil, more__, oneway__)
+func RemoveImage(c__ *varlink.Connection, more__ bool, oneway__ bool, name_ string, force_ bool) error {
+	var in struct {
+		Name  string `json:"name"`
+		Force bool   `json:"force"`
+	}
+	in.Name = name_
+	in.Force = force_
+	return c__.Send("io.projectatomic.podman.RemoveImage", in, more__, oneway__)
 }
 
-func ReadGetContainerLogs_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadRemoveImage_(c__ *varlink.Connection) (bool, error) {
+	continues_, err := c__.Receive(nil)
+	if err != nil {
+		return false, err
+	}
+	return continues_, nil
+}
+
+func GetVersion(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.GetVersion", nil, more__, oneway__)
+}
+
+func ReadGetVersion_(c__ *varlink.Connection, version_ *Version) (bool, error) {
 	var out struct {
-		Notimplemented NotImplemented `json:"notimplemented"`
+		Version Version `json:"version"`
 	}
 	continues_, err := c__.Receive(&out)
 	if err != nil {
 		return false, err
 	}
-	if notimplemented_ != nil {
-		*notimplemented_ = out.Notimplemented
+	if version_ != nil {
+		*version_ = out.Version
 	}
 	return continues_, nil
 }
@@ -712,29 +676,65 @@ func ReadListContainerProcesses_(c__ *varlink.Connection, notimplemented_ *NotIm
 	return continues_, nil
 }
 
-func ListImages(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.ListImages", nil, more__, oneway__)
+func StartContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.StartContainer", nil, more__, oneway__)
 }
 
-func ReadListImages_(c__ *varlink.Connection, images_ *[]ImageInList) (bool, error) {
+func ReadStartContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
-		Images []ImageInList `json:"images"`
+		Notimplemented NotImplemented `json:"notimplemented"`
 	}
 	continues_, err := c__.Receive(&out)
 	if err != nil {
 		return false, err
 	}
-	if images_ != nil {
-		*images_ = []ImageInList(out.Images)
+	if notimplemented_ != nil {
+		*notimplemented_ = out.Notimplemented
 	}
 	return continues_, nil
 }
 
-func CreateContainer(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
-	return c__.Send("io.projectatomic.podman.CreateContainer", nil, more__, oneway__)
+func DeleteStoppedContainers(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.DeleteStoppedContainers", nil, more__, oneway__)
 }
 
-func ReadCreateContainer_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+func ReadDeleteStoppedContainers_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+	var out struct {
+		Notimplemented NotImplemented `json:"notimplemented"`
+	}
+	continues_, err := c__.Receive(&out)
+	if err != nil {
+		return false, err
+	}
+	if notimplemented_ != nil {
+		*notimplemented_ = out.Notimplemented
+	}
+	return continues_, nil
+}
+
+func ListContainers(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.ListContainers", nil, more__, oneway__)
+}
+
+func ReadListContainers_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
+	var out struct {
+		Notimplemented NotImplemented `json:"notimplemented"`
+	}
+	continues_, err := c__.Receive(&out)
+	if err != nil {
+		return false, err
+	}
+	if notimplemented_ != nil {
+		*notimplemented_ = out.Notimplemented
+	}
+	return continues_, nil
+}
+
+func ResizeContainerTty(c__ *varlink.Connection, more__ bool, oneway__ bool) error {
+	return c__.Send("io.projectatomic.podman.ResizeContainerTty", nil, more__, oneway__)
+}
+
+func ReadResizeContainerTty_(c__ *varlink.Connection, notimplemented_ *NotImplemented) (bool, error) {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -750,43 +750,43 @@ func ReadCreateContainer_(c__ *varlink.Connection, notimplemented_ *NotImplement
 
 // Service interface with all methods
 type ioprojectatomicpodmanInterface interface {
-	PauseContainer(c__ VarlinkCall) error
-	DeleteStoppedContainers(c__ VarlinkCall) error
-	CreateImage(c__ VarlinkCall) error
-	CreateFromContainer(c__ VarlinkCall) error
-	PullImage(c__ VarlinkCall, name_ string) error
-	GetContainerLogs(c__ VarlinkCall) error
+	BuildImage(c__ VarlinkCall) error
 	RestartContainer(c__ VarlinkCall) error
-	UpdateContainer(c__ VarlinkCall) error
-	CreateContainer(c__ VarlinkCall) error
-	ListContainerProcesses(c__ VarlinkCall) error
-	ListImages(c__ VarlinkCall) error
-	GetContainerStats(c__ VarlinkCall) error
-	InspectImage(c__ VarlinkCall, name_ string) error
-	DeleteUnusedImages(c__ VarlinkCall) error
+	KillContainer(c__ VarlinkCall) error
+	WaitContainer(c__ VarlinkCall) error
 	ImportImage(c__ VarlinkCall, source_ string, reference_ string, message_ string, changes_ []string) error
-	ListContainers(c__ VarlinkCall) error
+	Ping(c__ VarlinkCall) error
+	CreateContainer(c__ VarlinkCall) error
 	InspectContainer(c__ VarlinkCall) error
-	ListContainerChanges(c__ VarlinkCall) error
-	KillContainer(c__ VarlinkCall) error
-	AttachToContainer(c__ VarlinkCall) error
+	GetContainerStats(c__ VarlinkCall) error
+	ExportContainer(c__ VarlinkCall) error
 	RemoveContainer(c__ VarlinkCall) error
+	SearchImage(c__ VarlinkCall, name_ string, limit_ int64) error
+	ExportImage(c__ VarlinkCall, name_ string, destination_ string, compress_ bool) error
 	StopContainer(c__ VarlinkCall) error
+	DeleteUnusedImages(c__ VarlinkCall) error
+	CreateFromContainer(c__ VarlinkCall) error
+	RenameContainer(c__ VarlinkCall) error
 	UnpauseContainer(c__ VarlinkCall) error
+	HistoryImage(c__ VarlinkCall, name_ string) error
+	RemoveImage(c__ VarlinkCall, name_ string, force_ bool) error
 	GetVersion(c__ VarlinkCall) error
+	ListContainerProcesses(c__ VarlinkCall) error
+	GetContainerLogs(c__ VarlinkCall) error
+	UpdateContainer(c__ VarlinkCall) error
+	ListContainers(c__ VarlinkCall) error
 	ResizeContainerTty(c__ VarlinkCall) error
 	StartContainer(c__ VarlinkCall) error
-	Ping(c__ VarlinkCall) error
-	HistoryImage(c__ VarlinkCall, name_ string) error
+	DeleteStoppedContainers(c__ VarlinkCall) error
+	AttachToContainer(c__ VarlinkCall) error
+	ListImages(c__ VarlinkCall) error
+	PullImage(c__ VarlinkCall, name_ string) error
 	PushImage(c__ VarlinkCall, name_ string, tag_ string, tlsverify_ bool) error
 	TagImage(c__ VarlinkCall, name_ string, tagged_ string) error
-	SearchImage(c__ VarlinkCall, name_ string, limit_ int64) error
-	ExportImage(c__ VarlinkCall, name_ string, destination_ string, compress_ bool) error
-	RenameContainer(c__ VarlinkCall) error
-	WaitContainer(c__ VarlinkCall) error
-	BuildImage(c__ VarlinkCall) error
-	ExportContainer(c__ VarlinkCall) error
-	RemoveImage(c__ VarlinkCall, name_ string, force_ bool) error
+	ListContainerChanges(c__ VarlinkCall) error
+	PauseContainer(c__ VarlinkCall) error
+	CreateImage(c__ VarlinkCall) error
+	InspectImage(c__ VarlinkCall, name_ string) error
 }
 
 // Service object with all methods
@@ -826,11 +826,11 @@ func (c__ *VarlinkCall) ReplyRuntimeError(reason_ string) error {
 }
 
 // Reply methods for all varlink methods
-func (c__ *VarlinkCall) ReplyGetVersion(version_ Version) error {
+func (c__ *VarlinkCall) ReplyListContainers(notimplemented_ NotImplemented) error {
 	var out struct {
-		Version Version `json:"version"`
+		Notimplemented NotImplemented `json:"notimplemented"`
 	}
-	out.Version = version_
+	out.Notimplemented = notimplemented_
 	return c__.Reply(&out)
 }
 
@@ -850,7 +850,7 @@ func (c__ *VarlinkCall) ReplyStartContainer(notimplemented_ NotImplemented) erro
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyStopContainer(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyDeleteStoppedContainers(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -858,7 +858,7 @@ func (c__ *VarlinkCall) ReplyStopContainer(notimplemented_ NotImplemented) error
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyUnpauseContainer(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyAttachToContainer(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -866,27 +866,31 @@ func (c__ *VarlinkCall) ReplyUnpauseContainer(notimplemented_ NotImplemented) er
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyPing(ping_ StringResponse) error {
+func (c__ *VarlinkCall) ReplyListImages(images_ []ImageInList) error {
 	var out struct {
-		Ping StringResponse `json:"ping"`
+		Images []ImageInList `json:"images"`
 	}
-	out.Ping = ping_
+	out.Images = []ImageInList(images_)
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplySearchImage(images_ []ImageSearch) error {
+func (c__ *VarlinkCall) ReplyPullImage(id_ string) error {
 	var out struct {
-		Images []ImageSearch `json:"images"`
+		Id string `json:"id"`
 	}
-	out.Images = []ImageSearch(images_)
+	out.Id = id_
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyExportImage() error {
+func (c__ *VarlinkCall) ReplyPushImage() error {
 	return c__.Reply(nil)
 }
 
-func (c__ *VarlinkCall) ReplyRenameContainer(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyTagImage() error {
+	return c__.Reply(nil)
+}
+
+func (c__ *VarlinkCall) ReplyListContainerChanges(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -894,7 +898,7 @@ func (c__ *VarlinkCall) ReplyRenameContainer(notimplemented_ NotImplemented) err
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyWaitContainer(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyPauseContainer(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -902,7 +906,7 @@ func (c__ *VarlinkCall) ReplyWaitContainer(notimplemented_ NotImplemented) error
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyBuildImage(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyCreateImage(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -910,23 +914,15 @@ func (c__ *VarlinkCall) ReplyBuildImage(notimplemented_ NotImplemented) error {
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyHistoryImage(history_ []ImageHistory) error {
+func (c__ *VarlinkCall) ReplyInspectImage(image_ string) error {
 	var out struct {
-		History []ImageHistory `json:"history"`
+		Image string `json:"image"`
 	}
-	out.History = []ImageHistory(history_)
+	out.Image = image_
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyPushImage() error {
-	return c__.Reply(nil)
-}
-
-func (c__ *VarlinkCall) ReplyTagImage() error {
-	return c__.Reply(nil)
-}
-
-func (c__ *VarlinkCall) ReplyExportContainer(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyBuildImage(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -934,11 +930,7 @@ func (c__ *VarlinkCall) ReplyExportContainer(notimplemented_ NotImplemented) err
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyRemoveImage() error {
-	return c__.Reply(nil)
-}
-
-func (c__ *VarlinkCall) ReplyCreateFromContainer(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyRestartContainer(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -946,15 +938,15 @@ func (c__ *VarlinkCall) ReplyCreateFromContainer(notimplemented_ NotImplemented)
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyPullImage(id_ string) error {
+func (c__ *VarlinkCall) ReplyKillContainer(notimplemented_ NotImplemented) error {
 	var out struct {
-		Id string `json:"id"`
+		Notimplemented NotImplemented `json:"notimplemented"`
 	}
-	out.Id = id_
+	out.Notimplemented = notimplemented_
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyGetContainerLogs(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyWaitContainer(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -962,23 +954,23 @@ func (c__ *VarlinkCall) ReplyGetContainerLogs(notimplemented_ NotImplemented) er
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyRestartContainer(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyImportImage(id_ string) error {
 	var out struct {
-		Notimplemented NotImplemented `json:"notimplemented"`
+		Id string `json:"id"`
 	}
-	out.Notimplemented = notimplemented_
+	out.Id = id_
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyUpdateContainer(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyPing(ping_ StringResponse) error {
 	var out struct {
-		Notimplemented NotImplemented `json:"notimplemented"`
+		Ping StringResponse `json:"ping"`
 	}
-	out.Notimplemented = notimplemented_
+	out.Ping = ping_
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyPauseContainer(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyCreateContainer(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -986,7 +978,7 @@ func (c__ *VarlinkCall) ReplyPauseContainer(notimplemented_ NotImplemented) erro
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyDeleteStoppedContainers(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyInspectContainer(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -994,7 +986,7 @@ func (c__ *VarlinkCall) ReplyDeleteStoppedContainers(notimplemented_ NotImplemen
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyCreateImage(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyGetContainerStats(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -1002,7 +994,7 @@ func (c__ *VarlinkCall) ReplyCreateImage(notimplemented_ NotImplemented) error {
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyCreateContainer(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyExportContainer(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -1010,7 +1002,7 @@ func (c__ *VarlinkCall) ReplyCreateContainer(notimplemented_ NotImplemented) err
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyListContainerProcesses(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyRemoveContainer(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -1018,31 +1010,35 @@ func (c__ *VarlinkCall) ReplyListContainerProcesses(notimplemented_ NotImplement
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyListImages(images_ []ImageInList) error {
+func (c__ *VarlinkCall) ReplySearchImage(images_ []ImageSearch) error {
 	var out struct {
-		Images []ImageInList `json:"images"`
+		Images []ImageSearch `json:"images"`
 	}
-	out.Images = []ImageInList(images_)
+	out.Images = []ImageSearch(images_)
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyImportImage(id_ string) error {
+func (c__ *VarlinkCall) ReplyExportImage() error {
+	return c__.Reply(nil)
+}
+
+func (c__ *VarlinkCall) ReplyStopContainer(notimplemented_ NotImplemented) error {
 	var out struct {
-		Id string `json:"id"`
+		Notimplemented NotImplemented `json:"notimplemented"`
 	}
-	out.Id = id_
+	out.Notimplemented = notimplemented_
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyListContainers(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyDeleteUnusedImages(images_ []string) error {
 	var out struct {
-		Notimplemented NotImplemented `json:"notimplemented"`
+		Images []string `json:"images"`
 	}
-	out.Notimplemented = notimplemented_
+	out.Images = []string(images_)
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyInspectContainer(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyCreateFromContainer(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -1050,7 +1046,7 @@ func (c__ *VarlinkCall) ReplyInspectContainer(notimplemented_ NotImplemented) er
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyListContainerChanges(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyRenameContainer(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -1058,7 +1054,7 @@ func (c__ *VarlinkCall) ReplyListContainerChanges(notimplemented_ NotImplemented
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyGetContainerStats(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyUnpauseContainer(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -1066,23 +1062,27 @@ func (c__ *VarlinkCall) ReplyGetContainerStats(notimplemented_ NotImplemented) e
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyInspectImage(image_ string) error {
+func (c__ *VarlinkCall) ReplyHistoryImage(history_ []ImageHistory) error {
 	var out struct {
-		Image string `json:"image"`
+		History []ImageHistory `json:"history"`
 	}
-	out.Image = image_
+	out.History = []ImageHistory(history_)
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyDeleteUnusedImages(images_ []string) error {
+func (c__ *VarlinkCall) ReplyRemoveImage() error {
+	return c__.Reply(nil)
+}
+
+func (c__ *VarlinkCall) ReplyGetVersion(version_ Version) error {
 	var out struct {
-		Images []string `json:"images"`
+		Version Version `json:"version"`
 	}
-	out.Images = []string(images_)
+	out.Version = version_
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyKillContainer(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyListContainerProcesses(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -1090,7 +1090,7 @@ func (c__ *VarlinkCall) ReplyKillContainer(notimplemented_ NotImplemented) error
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyAttachToContainer(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyGetContainerLogs(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -1098,7 +1098,7 @@ func (c__ *VarlinkCall) ReplyAttachToContainer(notimplemented_ NotImplemented) e
 	return c__.Reply(&out)
 }
 
-func (c__ *VarlinkCall) ReplyRemoveContainer(notimplemented_ NotImplemented) error {
+func (c__ *VarlinkCall) ReplyUpdateContainer(notimplemented_ NotImplemented) error {
 	var out struct {
 		Notimplemented NotImplemented `json:"notimplemented"`
 	}
@@ -1107,36 +1107,44 @@ func (c__ *VarlinkCall) ReplyRemoveContainer(notimplemented_ NotImplemented) err
 }
 
 // Dummy methods for all varlink methods
-func (s__ *VarlinkInterface) UnpauseContainer(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("UnpauseContainer")
+func (s__ *VarlinkInterface) KillContainer(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("KillContainer")
 }
 
-func (s__ *VarlinkInterface) GetVersion(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("GetVersion")
+func (s__ *VarlinkInterface) WaitContainer(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("WaitContainer")
 }
 
-func (s__ *VarlinkInterface) ResizeContainerTty(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("ResizeContainerTty")
+func (s__ *VarlinkInterface) ImportImage(c__ VarlinkCall, source_ string, reference_ string, message_ string, changes_ []string) error {
+	return c__.ReplyMethodNotImplemented("ImportImage")
 }
 
-func (s__ *VarlinkInterface) StartContainer(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("StartContainer")
+func (s__ *VarlinkInterface) Ping(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("Ping")
 }
 
-func (s__ *VarlinkInterface) StopContainer(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("StopContainer")
+func (s__ *VarlinkInterface) CreateContainer(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("CreateContainer")
 }
 
-func (s__ *VarlinkInterface) Ping(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("Ping")
+func (s__ *VarlinkInterface) InspectContainer(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("InspectContainer")
 }
 
-func (s__ *VarlinkInterface) PushImage(c__ VarlinkCall, name_ string, tag_ string, tlsverify_ bool) error {
-	return c__.ReplyMethodNotImplemented("PushImage")
+func (s__ *VarlinkInterface) GetContainerStats(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("GetContainerStats")
 }
 
-func (s__ *VarlinkInterface) TagImage(c__ VarlinkCall, name_ string, tagged_ string) error {
-	return c__.ReplyMethodNotImplemented("TagImage")
+func (s__ *VarlinkInterface) RestartContainer(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("RestartContainer")
+}
+
+func (s__ *VarlinkInterface) ExportContainer(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("ExportContainer")
+}
+
+func (s__ *VarlinkInterface) RemoveContainer(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("RemoveContainer")
 }
 
 func (s__ *VarlinkInterface) SearchImage(c__ VarlinkCall, name_ string, limit_ int64) error {
@@ -1147,230 +1155,252 @@ func (s__ *VarlinkInterface) ExportImage(c__ VarlinkCall, name_ string, destinat
 	return c__.ReplyMethodNotImplemented("ExportImage")
 }
 
-func (s__ *VarlinkInterface) RenameContainer(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("RenameContainer")
+func (s__ *VarlinkInterface) StopContainer(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("StopContainer")
 }
 
-func (s__ *VarlinkInterface) WaitContainer(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("WaitContainer")
+func (s__ *VarlinkInterface) DeleteUnusedImages(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("DeleteUnusedImages")
 }
 
-func (s__ *VarlinkInterface) BuildImage(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("BuildImage")
+func (s__ *VarlinkInterface) CreateFromContainer(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("CreateFromContainer")
 }
 
-func (s__ *VarlinkInterface) HistoryImage(c__ VarlinkCall, name_ string) error {
-	return c__.ReplyMethodNotImplemented("HistoryImage")
+func (s__ *VarlinkInterface) UnpauseContainer(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("UnpauseContainer")
 }
 
-func (s__ *VarlinkInterface) ExportContainer(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("ExportContainer")
+func (s__ *VarlinkInterface) HistoryImage(c__ VarlinkCall, name_ string) error {
+	return c__.ReplyMethodNotImplemented("HistoryImage")
 }
 
 func (s__ *VarlinkInterface) RemoveImage(c__ VarlinkCall, name_ string, force_ bool) error {
 	return c__.ReplyMethodNotImplemented("RemoveImage")
 }
 
-func (s__ *VarlinkInterface) DeleteStoppedContainers(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("DeleteStoppedContainers")
-}
-
-func (s__ *VarlinkInterface) CreateImage(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("CreateImage")
-}
-
-func (s__ *VarlinkInterface) CreateFromContainer(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("CreateFromContainer")
+func (s__ *VarlinkInterface) GetVersion(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("GetVersion")
 }
 
-func (s__ *VarlinkInterface) PullImage(c__ VarlinkCall, name_ string) error {
-	return c__.ReplyMethodNotImplemented("PullImage")
+func (s__ *VarlinkInterface) ListContainerProcesses(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("ListContainerProcesses")
 }
 
 func (s__ *VarlinkInterface) GetContainerLogs(c__ VarlinkCall) error {
 	return c__.ReplyMethodNotImplemented("GetContainerLogs")
 }
 
-func (s__ *VarlinkInterface) RestartContainer(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("RestartContainer")
-}
-
 func (s__ *VarlinkInterface) UpdateContainer(c__ VarlinkCall) error {
 	return c__.ReplyMethodNotImplemented("UpdateContainer")
 }
 
-func (s__ *VarlinkInterface) PauseContainer(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("PauseContainer")
+func (s__ *VarlinkInterface) RenameContainer(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("RenameContainer")
 }
 
-func (s__ *VarlinkInterface) CreateContainer(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("CreateContainer")
+func (s__ *VarlinkInterface) ListContainers(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("ListContainers")
 }
 
-func (s__ *VarlinkInterface) ListContainerProcesses(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("ListContainerProcesses")
+func (s__ *VarlinkInterface) ResizeContainerTty(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("ResizeContainerTty")
 }
 
-func (s__ *VarlinkInterface) ListImages(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("ListImages")
+func (s__ *VarlinkInterface) StartContainer(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("StartContainer")
 }
 
-func (s__ *VarlinkInterface) InspectImage(c__ VarlinkCall, name_ string) error {
-	return c__.ReplyMethodNotImplemented("InspectImage")
+func (s__ *VarlinkInterface) DeleteStoppedContainers(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("DeleteStoppedContainers")
 }
 
-func (s__ *VarlinkInterface) DeleteUnusedImages(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("DeleteUnusedImages")
+func (s__ *VarlinkInterface) AttachToContainer(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("AttachToContainer")
 }
 
-func (s__ *VarlinkInterface) ImportImage(c__ VarlinkCall, source_ string, reference_ string, message_ string, changes_ []string) error {
-	return c__.ReplyMethodNotImplemented("ImportImage")
+func (s__ *VarlinkInterface) ListImages(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("ListImages")
 }
 
-func (s__ *VarlinkInterface) ListContainers(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("ListContainers")
+func (s__ *VarlinkInterface) PullImage(c__ VarlinkCall, name_ string) error {
+	return c__.ReplyMethodNotImplemented("PullImage")
 }
 
-func (s__ *VarlinkInterface) InspectContainer(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("InspectContainer")
+func (s__ *VarlinkInterface) TagImage(c__ VarlinkCall, name_ string, tagged_ string) error {
+	return c__.ReplyMethodNotImplemented("TagImage")
 }
 
 func (s__ *VarlinkInterface) ListContainerChanges(c__ VarlinkCall) error {
 	return c__.ReplyMethodNotImplemented("ListContainerChanges")
 }
 
-func (s__ *VarlinkInterface) GetContainerStats(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("GetContainerStats")
+func (s__ *VarlinkInterface) PauseContainer(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("PauseContainer")
 }
 
-func (s__ *VarlinkInterface) KillContainer(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("KillContainer")
+func (s__ *VarlinkInterface) CreateImage(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("CreateImage")
 }
 
-func (s__ *VarlinkInterface) AttachToContainer(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("AttachToContainer")
+func (s__ *VarlinkInterface) InspectImage(c__ VarlinkCall, name_ string) error {
+	return c__.ReplyMethodNotImplemented("InspectImage")
 }
 
-func (s__ *VarlinkInterface) RemoveContainer(c__ VarlinkCall) error {
-	return c__.ReplyMethodNotImplemented("RemoveContainer")
+func (s__ *VarlinkInterface) PushImage(c__ VarlinkCall, name_ string, tag_ string, tlsverify_ bool) error {
+	return c__.ReplyMethodNotImplemented("PushImage")
+}
+
+func (s__ *VarlinkInterface) BuildImage(c__ VarlinkCall) error {
+	return c__.ReplyMethodNotImplemented("BuildImage")
 }
 
 // Method call dispatcher
 func (s__ *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname string) error {
 	switch methodname {
-	case "KillContainer":
-		return s__.ioprojectatomicpodmanInterface.KillContainer(VarlinkCall{call})
-
 	case "AttachToContainer":
 		return s__.ioprojectatomicpodmanInterface.AttachToContainer(VarlinkCall{call})
 
-	case "RemoveContainer":
-		return s__.ioprojectatomicpodmanInterface.RemoveContainer(VarlinkCall{call})
-
-	case "GetVersion":
-		return s__.ioprojectatomicpodmanInterface.GetVersion(VarlinkCall{call})
-
-	case "ResizeContainerTty":
-		return s__.ioprojectatomicpodmanInterface.ResizeContainerTty(VarlinkCall{call})
-
-	case "StartContainer":
-		return s__.ioprojectatomicpodmanInterface.StartContainer(VarlinkCall{call})
-
-	case "StopContainer":
-		return s__.ioprojectatomicpodmanInterface.StopContainer(VarlinkCall{call})
-
-	case "UnpauseContainer":
-		return s__.ioprojectatomicpodmanInterface.UnpauseContainer(VarlinkCall{call})
+	case "ListImages":
+		return s__.ioprojectatomicpodmanInterface.ListImages(VarlinkCall{call})
 
-	case "Ping":
-		return s__.ioprojectatomicpodmanInterface.Ping(VarlinkCall{call})
+	case "PullImage":
+		var in struct {
+			Name string `json:"name"`
+		}
+		err := call.GetParameters(&in)
+		if err != nil {
+			return call.ReplyInvalidParameter("parameters")
+		}
+		return s__.ioprojectatomicpodmanInterface.PullImage(VarlinkCall{call}, in.Name)
 
-	case "TagImage":
+	case "InspectImage":
 		var in struct {
-			Name   string `json:"name"`
-			Tagged string `json:"tagged"`
+			Name string `json:"name"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s__.ioprojectatomicpodmanInterface.TagImage(VarlinkCall{call}, in.Name, in.Tagged)
+		return s__.ioprojectatomicpodmanInterface.InspectImage(VarlinkCall{call}, in.Name)
 
-	case "SearchImage":
+	case "PushImage":
 		var in struct {
-			Name  string `json:"name"`
-			Limit int64  `json:"limit"`
+			Name      string `json:"name"`
+			Tag       string `json:"tag"`
+			Tlsverify bool   `json:"tlsverify"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s__.ioprojectatomicpodmanInterface.SearchImage(VarlinkCall{call}, in.Name, in.Limit)
+		return s__.ioprojectatomicpodmanInterface.PushImage(VarlinkCall{call}, in.Name, in.Tag, in.Tlsverify)
 
-	case "ExportImage":
+	case "TagImage":
 		var in struct {
-			Name        string `json:"name"`
-			Destination string `json:"destination"`
-			Compress    bool   `json:"compress"`
+			Name   string `json:"name"`
+			Tagged string `json:"tagged"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s__.ioprojectatomicpodmanInterface.ExportImage(VarlinkCall{call}, in.Name, in.Destination, in.Compress)
+		return s__.ioprojectatomicpodmanInterface.TagImage(VarlinkCall{call}, in.Name, in.Tagged)
 
-	case "RenameContainer":
-		return s__.ioprojectatomicpodmanInterface.RenameContainer(VarlinkCall{call})
+	case "ListContainerChanges":
+		return s__.ioprojectatomicpodmanInterface.ListContainerChanges(VarlinkCall{call})
 
-	case "WaitContainer":
-		return s__.ioprojectatomicpodmanInterface.WaitContainer(VarlinkCall{call})
+	case "PauseContainer":
+		return s__.ioprojectatomicpodmanInterface.PauseContainer(VarlinkCall{call})
+
+	case "CreateImage":
+		return s__.ioprojectatomicpodmanInterface.CreateImage(VarlinkCall{call})
 
 	case "BuildImage":
 		return s__.ioprojectatomicpodmanInterface.BuildImage(VarlinkCall{call})
 
-	case "HistoryImage":
+	case "GetContainerStats":
+		return s__.ioprojectatomicpodmanInterface.GetContainerStats(VarlinkCall{call})
+
+	case "RestartContainer":
+		return s__.ioprojectatomicpodmanInterface.RestartContainer(VarlinkCall{call})
+
+	case "KillContainer":
+		return s__.ioprojectatomicpodmanInterface.KillContainer(VarlinkCall{call})
+
+	case "WaitContainer":
+		return s__.ioprojectatomicpodmanInterface.WaitContainer(VarlinkCall{call})
+
+	case "ImportImage":
 		var in struct {
-			Name string `json:"name"`
+			Source    string   `json:"source"`
+			Reference string   `json:"reference"`
+			Message   string   `json:"message"`
+			Changes   []string `json:"changes"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s__.ioprojectatomicpodmanInterface.HistoryImage(VarlinkCall{call}, in.Name)
+		return s__.ioprojectatomicpodmanInterface.ImportImage(VarlinkCall{call}, in.Source, in.Reference, in.Message, []string(in.Changes))
 
-	case "PushImage":
+	case "Ping":
+		return s__.ioprojectatomicpodmanInterface.Ping(VarlinkCall{call})
+
+	case "CreateContainer":
+		return s__.ioprojectatomicpodmanInterface.CreateContainer(VarlinkCall{call})
+
+	case "InspectContainer":
+		return s__.ioprojectatomicpodmanInterface.InspectContainer(VarlinkCall{call})
+
+	case "ExportImage":
 		var in struct {
-			Name      string `json:"name"`
-			Tag       string `json:"tag"`
-			Tlsverify bool   `json:"tlsverify"`
+			Name        string `json:"name"`
+			Destination string `json:"destination"`
+			Compress    bool   `json:"compress"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s__.ioprojectatomicpodmanInterface.PushImage(VarlinkCall{call}, in.Name, in.Tag, in.Tlsverify)
+		return s__.ioprojectatomicpodmanInterface.ExportImage(VarlinkCall{call}, in.Name, in.Destination, in.Compress)
 
 	case "ExportContainer":
 		return s__.ioprojectatomicpodmanInterface.ExportContainer(VarlinkCall{call})
 
-	case "RemoveImage":
+	case "RemoveContainer":
+		return s__.ioprojectatomicpodmanInterface.RemoveContainer(VarlinkCall{call})
+
+	case "SearchImage":
 		var in struct {
 			Name  string `json:"name"`
-			Force bool   `json:"force"`
+			Limit int64  `json:"limit"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s__.ioprojectatomicpodmanInterface.RemoveImage(VarlinkCall{call}, in.Name, in.Force)
+		return s__.ioprojectatomicpodmanInterface.SearchImage(VarlinkCall{call}, in.Name, in.Limit)
 
-	case "CreateImage":
-		return s__.ioprojectatomicpodmanInterface.CreateImage(VarlinkCall{call})
+	case "StopContainer":
+		return s__.ioprojectatomicpodmanInterface.StopContainer(VarlinkCall{call})
+
+	case "DeleteUnusedImages":
+		return s__.ioprojectatomicpodmanInterface.DeleteUnusedImages(VarlinkCall{call})
 
 	case "CreateFromContainer":
 		return s__.ioprojectatomicpodmanInterface.CreateFromContainer(VarlinkCall{call})
 
-	case "PullImage":
+	case "UpdateContainer":
+		return s__.ioprojectatomicpodmanInterface.UpdateContainer(VarlinkCall{call})
+
+	case "RenameContainer":
+		return s__.ioprojectatomicpodmanInterface.RenameContainer(VarlinkCall{call})
+
+	case "UnpauseContainer":
+		return s__.ioprojectatomicpodmanInterface.UnpauseContainer(VarlinkCall{call})
+
+	case "HistoryImage":
 		var in struct {
 			Name string `json:"name"`
 		}
@@ -1378,69 +1408,39 @@ func (s__ *VarlinkInterface) VarlinkDispatch(call varlink.Call, methodname strin
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s__.ioprojectatomicpodmanInterface.PullImage(VarlinkCall{call}, in.Name)
-
-	case "GetContainerLogs":
-		return s__.ioprojectatomicpodmanInterface.GetContainerLogs(VarlinkCall{call})
-
-	case "RestartContainer":
-		return s__.ioprojectatomicpodmanInterface.RestartContainer(VarlinkCall{call})
-
-	case "UpdateContainer":
-		return s__.ioprojectatomicpodmanInterface.UpdateContainer(VarlinkCall{call})
-
-	case "PauseContainer":
-		return s__.ioprojectatomicpodmanInterface.PauseContainer(VarlinkCall{call})
-
-	case "DeleteStoppedContainers":
-		return s__.ioprojectatomicpodmanInterface.DeleteStoppedContainers(VarlinkCall{call})
-
-	case "CreateContainer":
-		return s__.ioprojectatomicpodmanInterface.CreateContainer(VarlinkCall{call})
-
-	case "ListContainerProcesses":
-		return s__.ioprojectatomicpodmanInterface.ListContainerProcesses(VarlinkCall{call})
-
-	case "ListImages":
-		return s__.ioprojectatomicpodmanInterface.ListImages(VarlinkCall{call})
-
-	case "DeleteUnusedImages":
-		return s__.ioprojectatomicpodmanInterface.DeleteUnusedImages(VarlinkCall{call})
+		return s__.ioprojectatomicpodmanInterface.HistoryImage(VarlinkCall{call}, in.Name)
 
-	case "ImportImage":
+	case "RemoveImage":
 		var in struct {
-			Source    string   `json:"source"`
-			Reference string   `json:"reference"`
-			Message   string   `json:"message"`
-			Changes   []string `json:"changes"`
+			Name  string `json:"name"`
+			Force bool   `json:"force"`
 		}
 		err := call.GetParameters(&in)
 		if err != nil {
 			return call.ReplyInvalidParameter("parameters")
 		}
-		return s__.ioprojectatomicpodmanInterface.ImportImage(VarlinkCall{call}, in.Source, in.Reference, in.Message, []string(in.Changes))
+		return s__.ioprojectatomicpodmanInterface.RemoveImage(VarlinkCall{call}, in.Name, in.Force)
 
-	case "ListContainers":
-		return s__.ioprojectatomicpodmanInterface.ListContainers(VarlinkCall{call})
+	case "GetVersion":
+		return s__.ioprojectatomicpodmanInterface.GetVersion(VarlinkCall{call})
 
-	case "InspectContainer":
-		return s__.ioprojectatomicpodmanInterface.InspectContainer(VarlinkCall{call})
+	case "ListContainerProcesses":
+		return s__.ioprojectatomicpodmanInterface.ListContainerProcesses(VarlinkCall{call})
 
-	case "ListContainerChanges":
-		return s__.ioprojectatomicpodmanInterface.ListContainerChanges(VarlinkCall{call})
+	case "GetContainerLogs":
+		return s__.ioprojectatomicpodmanInterface.GetContainerLogs(VarlinkCall{call})
 
-	case "GetContainerStats":
-		return s__.ioprojectatomicpodmanInterface.GetContainerStats(VarlinkCall{call})
+	case "DeleteStoppedContainers":
+		return s__.ioprojectatomicpodmanInterface.DeleteStoppedContainers(VarlinkCall{call})
 
-	case "InspectImage":
-		var in struct {
-			Name string `json:"name"`
-		}
-		err := call.GetParameters(&in)
-		if err != nil {
-			return call.ReplyInvalidParameter("parameters")
-		}
-		return s__.ioprojectatomicpodmanInterface.InspectImage(VarlinkCall{call}, in.Name)
+	case "ListContainers":
+		return s__.ioprojectatomicpodmanInterface.ListContainers(VarlinkCall{call})
+
+	case "ResizeContainerTty":
+		return s__.ioprojectatomicpodmanInterface.ResizeContainerTty(VarlinkCall{call})
+
+	case "StartContainer":
+		return s__.ioprojectatomicpodmanInterface.StartContainer(VarlinkCall{call})
 
 	default:
 		return call.ReplyMethodNotFound(methodname)