diff options
| author | Jhon Honce <jhonce@redhat.com> | 2019-07-26 16:04:17 -0700 |
|---|---|---|
| committer | Jhon Honce <jhonce@redhat.com> | 2019-07-26 16:04:17 -0700 |
| commit | 40bf0649afcb0bff839e5cb52b03099b4e16a539 (patch) | |
| tree | 25e184b92f5a6f3f5ff40ef7b45ab7b8dc94b5ac | |
| parent | 0c4dfcfe57559d55786818b027ad12ad94574e71 (diff) | |
| download | podman-40bf0649afcb0bff839e5cb52b03099b4e16a539.tar.gz podman-40bf0649afcb0bff839e5cb52b03099b4e16a539.tar.bz2 podman-40bf0649afcb0bff839e5cb52b03099b4e16a539.zip | |
Fix commit --changes env=X=Y
Signed-off-by: Jhon Honce <jhonce@redhat.com>
| -rw-r--r-- | cmd/podman/shared/create.go | 16 | ||||
| -rw-r--r-- | libpod/container_commit.go | 3 |
2 files changed, 12 insertions, 7 deletions
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go index 9578eb17d..43b1b4067 100644 --- a/cmd/podman/shared/create.go +++ b/cmd/podman/shared/create.go @@ -4,7 +4,6 @@ import ( "context" "encoding/json" "fmt" - "github.com/containers/libpod/pkg/errorhandling" "io" "os" "path/filepath" @@ -18,6 +17,7 @@ import ( "github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod/image" ann "github.com/containers/libpod/pkg/annotations" + "github.com/containers/libpod/pkg/errorhandling" "github.com/containers/libpod/pkg/inspect" ns "github.com/containers/libpod/pkg/namespaces" "github.com/containers/libpod/pkg/rootless" @@ -77,7 +77,11 @@ func CreateContainer(ctx context.Context, c *GenericCLIResults, runtime *libpod. writer = os.Stderr } - newImage, err := runtime.ImageRuntime().New(ctx, c.InputArgs[0], rtc.SignaturePolicyPath, GetAuthFile(""), writer, nil, image.SigningOptions{}, false, nil) + name := "" + if len(c.InputArgs) != 0 { + name = c.InputArgs[0] + } + newImage, err := runtime.ImageRuntime().New(ctx, name, rtc.SignaturePolicyPath, GetAuthFile(""), writer, nil, image.SigningOptions{}, false, nil) if err != nil { return nil, nil, err } @@ -681,7 +685,7 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod. DNSServers: c.StringSlice("dns"), Entrypoint: entrypoint, Env: env, - //ExposedPorts: ports, + // ExposedPorts: ports, GroupAdd: c.StringSlice("group-add"), Hostname: c.String("hostname"), HostAdd: c.StringSlice("add-host"), @@ -693,16 +697,16 @@ func ParseCreateOpts(ctx context.Context, c *GenericCLIResults, runtime *libpod. Image: imageName, ImageID: imageID, Interactive: c.Bool("interactive"), - //IP6Address: c.String("ipv6"), // Not implemented yet - needs CNI support for static v6 + // IP6Address: c.String("ipv6"), // Not implemented yet - needs CNI support for static v6 IPAddress: c.String("ip"), Labels: labels, - //LinkLocalIP: c.StringSlice("link-local-ip"), // Not implemented yet + // LinkLocalIP: c.StringSlice("link-local-ip"), // Not implemented yet LogDriver: logDriver, LogDriverOpt: c.StringSlice("log-opt"), MacAddress: c.String("mac-address"), Name: c.String("name"), Network: network, - //NetworkAlias: c.StringSlice("network-alias"), // Not implemented - does this make sense in Podman? + // NetworkAlias: c.StringSlice("network-alias"), // Not implemented - does this make sense in Podman? IpcMode: ipcMode, NetMode: netMode, UtsMode: utsMode, diff --git a/libpod/container_commit.go b/libpod/container_commit.go index 17586bfad..8dfeee9b8 100644 --- a/libpod/container_commit.go +++ b/libpod/container_commit.go @@ -19,7 +19,7 @@ import ( // ContainerCommitOptions is a struct used to commit a container to an image // It uses buildah's CommitOptions as a base. Long-term we might wish to // add these to the buildah struct once buildah is more integrated with -//libpod +// libpod type ContainerCommitOptions struct { buildah.CommitOptions Pause bool @@ -177,6 +177,7 @@ func (c *Container) Commit(ctx context.Context, destImage string, options Contai return nil, errors.Errorf("invalid env variable %q: not defined in your environment", name) } } else { + name = change[0] val = strings.Join(change[1:], " ") } if !isEnvCleared { // Multiple values are valid, only clear once. |