opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-20 16:47:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix podman command --change CMD

Browse Source 
Currently in Docker if you commit with --change 'CMD a b c'
The command that gets added is

[/bin/sh -c "a b c"]

If you commit --change 'CMD ["a","b","c"]'

You get
[a b c]

This patch set makes podman match this behaviour.

Similar change required for Entrypoint.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2019-04-16 06:26:47 -04:00
parent bf5ffdafb4
commit 6b3d4abb07
3 changed files with 60 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libpod/container_commit.go
View File

@ -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], "=")
}