summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-04-18 05:23:43 -0700
committerGitHub <noreply@github.com>2019-04-18 05:23:43 -0700
commit5260d33f95c652053c7c17b18fa843915dc22322 (patch)
tree3971a17971bd4acc842de0b776843d34a8e1e7fc
parent8b027dee48c6ac738bd1a2ac2b0f0a3f60e82945 (diff)
parent6b3d4abb07bd15f6ca2c2f1dc007c325b9cc0dc4 (diff)
downloadpodman-5260d33f95c652053c7c17b18fa843915dc22322.tar.gz
podman-5260d33f95c652053c7c17b18fa843915dc22322.tar.bz2
podman-5260d33f95c652053c7c17b18fa843915dc22322.zip
Merge pull request #2952 from rhatdan/change
Fix podman command --change CMD
-rw-r--r--cmd/podman/commit.go5
-rw-r--r--libpod/container_commit.go36
-rw-r--r--test/e2e/commit_test.go25
3 files changed, 60 insertions, 6 deletions
diff --git a/cmd/podman/commit.go b/cmd/podman/commit.go
index 5963f8686..8d79c1e28 100644
--- a/cmd/podman/commit.go
+++ b/cmd/podman/commit.go
@@ -42,7 +42,7 @@ func init() {
commitCommand.SetHelpTemplate(HelpTemplate())
commitCommand.SetUsageTemplate(UsageTemplate())
flags := commitCommand.Flags()
- flags.StringSliceVarP(&commitCommand.Change, "change", "c", []string{}, fmt.Sprintf("Apply the following possible instructions to the created image (default []): %s", strings.Join(libpod.ChangeCmds, " | ")))
+ flags.StringArrayVarP(&commitCommand.Change, "change", "c", []string{}, fmt.Sprintf("Apply the following possible instructions to the created image (default []): %s", strings.Join(libpod.ChangeCmds, " | ")))
flags.StringVarP(&commitCommand.Format, "format", "f", "oci", "`Format` of the image manifest and metadata")
flags.StringVarP(&commitCommand.Message, "message", "m", "", "Set commit message for imported image")
flags.StringVarP(&commitCommand.Author, "author", "a", "", "Set the author for the image committed")
@@ -83,6 +83,9 @@ func commitCmd(c *cliconfig.CommitValues) error {
if c.Flag("change").Changed {
for _, change := range c.Change {
splitChange := strings.Split(strings.ToUpper(change), "=")
+ if len(splitChange) == 1 {
+ splitChange = strings.Split(strings.ToUpper(change), " ")
+ }
if !util.StringInSlice(splitChange[0], libpod.ChangeCmds) {
return errors.Errorf("invalid syntax for --change: %s", change)
}
diff --git a/libpod/container_commit.go b/libpod/container_commit.go
index 3cc4b2c92..ae04f67bb 100644
--- a/libpod/container_commit.go
+++ b/libpod/container_commit.go
@@ -125,23 +125,48 @@ func (c *Container) Commit(ctx context.Context, destImage string, options Contai
// Workdir
importBuilder.SetWorkDir(c.Spec().Process.Cwd)
+ genCmd := func(cmd string) []string {
+ trim := func(cmd []string) []string {
+ if len(cmd) == 0 {
+ return cmd
+ }
+
+ retCmd := []string{}
+ for _, c := range cmd {
+ if len(c) >= 2 {
+ if c[0] == '"' && c[len(c)-1] == '"' {
+ retCmd = append(retCmd, c[1:len(c)-1])
+ continue
+ }
+ }
+ retCmd = append(retCmd, c)
+ }
+ return retCmd
+ }
+ if strings.HasPrefix(cmd, "[") {
+ cmd = strings.TrimPrefix(cmd, "[")
+ cmd = strings.TrimSuffix(cmd, "]")
+ return trim(strings.Split(cmd, ","))
+ }
+ return []string{"/bin/sh", "-c", cmd}
+ }
// Process user changes
for _, change := range options.Changes {
- splitChange := strings.SplitN(change, " ", 2)
+ splitChange := strings.SplitN(change, "=", 2)
if len(splitChange) != 2 {
- splitChange = strings.SplitN(change, "=", 2)
+ splitChange = strings.SplitN(change, " ", 2)
if len(splitChange) < 2 {
return nil, errors.Errorf("invalid change %s format", change)
}
}
- change := strings.Split(splitChange[1], " ")
switch strings.ToUpper(splitChange[0]) {
case "CMD":
- importBuilder.SetCmd(change)
+ importBuilder.SetCmd(genCmd(splitChange[1]))
case "ENTRYPOINT":
- importBuilder.SetEntrypoint(change)
+ importBuilder.SetEntrypoint(genCmd(splitChange[1]))
case "ENV":
+ change := strings.Split(splitChange[1], " ")
name := change[0]
val := ""
if len(change) < 2 {
@@ -168,6 +193,7 @@ func (c *Container) Commit(ctx context.Context, destImage string, options Contai
}
importBuilder.SetPort(splitChange[1])
case "LABEL":
+ change := strings.Split(splitChange[1], " ")
if len(change) < 2 {
change = strings.Split(change[0], "=")
}
diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go
index 93e1ea7af..3ece4887e 100644
--- a/test/e2e/commit_test.go
+++ b/test/e2e/commit_test.go
@@ -117,6 +117,31 @@ var _ = Describe("Podman commit", func() {
Expect(foundBlue).To(Equal(true))
})
+ It("podman commit container with change CMD flag", func() {
+ test := podmanTest.Podman([]string{"run", "--name", "test1", "-d", ALPINE, "ls"})
+ test.WaitWithDefaultTimeout()
+ Expect(test.ExitCode()).To(Equal(0))
+ Expect(podmanTest.NumberOfContainers()).To(Equal(1))
+
+ session := podmanTest.Podman([]string{"commit", "--change", "CMD a b c", "test1", "foobar.com/test1-image:latest"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Equal(0))
+
+ session = podmanTest.Podman([]string{"inspect", "--format", "{{.Config.Cmd}}", "foobar.com/test1-image:latest"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Equal(0))
+ Expect(session.OutputToString()).To(ContainSubstring("sh -c a b c"))
+
+ session = podmanTest.Podman([]string{"commit", "--change", "CMD=[\"a\",\"b\",\"c\"]", "test1", "foobar.com/test1-image:latest"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Equal(0))
+
+ session = podmanTest.Podman([]string{"inspect", "--format", "{{.Config.Cmd}}", "foobar.com/test1-image:latest"})
+ session.WaitWithDefaultTimeout()
+ Expect(session.ExitCode()).To(Equal(0))
+ Expect(session.OutputToString()).To(Not(ContainSubstring("sh -c")))
+ })
+
It("podman commit container with pause flag", func() {
_, ec, _ := podmanTest.RunLsContainer("test1")
Expect(ec).To(Equal(0))