erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-08-12 20:05:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

runlabel should sub podman for docker|/usr/bin/docker

Browse source 
Many RH images use a fully-qualified path to docker in their RUN
labels.  While initially we wanted an exact match for substituting
commands, docker is a good exception.

Bug #1623282

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude 2018-12-13 10:23:22 -06:00
parent e3a1a7efca
commit 0c3501acb5
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
cmd/podman/shared/funcs.go
View file

@ -10,10 +10,23 @@ import (
)
func substituteCommand(cmd string) (string, error) {
var (
newCommand string
)
// Replace cmd with "/proc/self/exe" if "podman" or "docker" is being
// used. If "/usr/bin/docker" is provided, we also sub in podman.
// Otherwise, leave the command unchanged.
if cmd == "podman" || filepath.Base(cmd) == "docker" {
newCommand = "/proc/self/exe"
} else {
newCommand = cmd
}
// If cmd is an absolute or relative path, check if the file exists.
// Throw an error if it doesn't exist.
if strings.Contains(cmd, "/") || strings.HasPrefix(cmd, ".") {
res, err := filepath.Abs(cmd)
if strings.Contains(newCommand, "/") || strings.HasPrefix(newCommand, ".") {
res, err := filepath.Abs(newCommand)
if err != nil {
return "", err
}
@ -24,16 +37,7 @@ func substituteCommand(cmd string) (string, error) {
}
}
// Replace cmd with "/proc/self/exe" if "podman" or "docker" is being
// used. Otherwise, leave the command unchanged.
switch cmd {
case "podman":
fallthrough
case "docker":
return "/proc/self/exe", nil
default:
return cmd, nil
}
return newCommand, nil
}
// GenerateCommand takes a label (string) and converts it to an executable command