diff options
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/api/Makefile | 1 | ||||
| -rw-r--r-- | pkg/api/handlers/types.go | 4 | ||||
| -rw-r--r-- | pkg/bindings/test/common_test.go | 6 | ||||
| -rw-r--r-- | pkg/rootless/rootless_linux.c | 3 |
4 files changed, 11 insertions, 3 deletions
diff --git a/pkg/api/Makefile b/pkg/api/Makefile index f564b6516..c68e50011 100644 --- a/pkg/api/Makefile +++ b/pkg/api/Makefile @@ -10,4 +10,3 @@ ${SWAGGER_OUT}: # generate doesn't remove file on error rm -f ${SWAGGER_OUT} swagger generate spec -o ${SWAGGER_OUT} -i tags.yaml -w ./ - diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go index 33cf1e95d..9c8562744 100644 --- a/pkg/api/handlers/types.go +++ b/pkg/api/handlers/types.go @@ -360,7 +360,7 @@ func LibpodToContainer(l *libpod.Container, infoData []define.InfoData) (*Contai return &Container{docker.Container{ ID: l.ID(), - Names: []string{l.Name()}, + Names: []string{fmt.Sprintf("/%s", l.Name())}, Image: imageName, ImageID: imageId, Command: strings.Join(l.Command(), " "), @@ -431,7 +431,7 @@ func LibpodToContainerJSON(l *libpod.Container) (*docker.ContainerJSON, error) { HostsPath: inspect.HostsPath, LogPath: l.LogPath(), Node: nil, - Name: l.Name(), + Name: fmt.Sprintf("/%s", l.Name()), RestartCount: 0, Driver: inspect.Driver, Platform: "linux", diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go index e3e66c89f..15783041f 100644 --- a/pkg/bindings/test/common_test.go +++ b/pkg/bindings/test/common_test.go @@ -62,6 +62,12 @@ func (b *bindingTest) runPodman(command []string) *gexec.Session { } else { cmd = append(cmd, "--runroot", b.runRoot) } + val, ok = os.LookupEnv("TEMPDIR") + if ok { + cmd = append(cmd, "--tmpdir", val) + } else { + cmd = append(cmd, "--tmpdir", b.tempDirPath) + } val, ok = os.LookupEnv("STORAGE_DRIVER") if ok { cmd = append(cmd, "--storage-driver", val) diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index 041a161dc..83f4f3254 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -200,6 +200,9 @@ can_use_shortcut () if (argv == NULL) return false; + if (strstr (argv[0], "podman") == NULL) + return false; + for (argc = 0; argv[argc]; argc++) { if (argc == 0 || argv[argc][0] == '-') |