summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-10-29 19:31:24 +0100
committerGitHub <noreply@github.com>2020-10-29 19:31:24 +0100
commitc08e82aa2578270271e23ce6e4fa22509744cc96 (patch)
tree594fb5c4fa0fbe0e53e7eabc4301cf3f3b25583b /cmd
parent222d8075ab08265c6dce8cf0f26a60c9afb64705 (diff)
parent12647ae33f1ac1c8b41f7dac8574667140c56c20 (diff)
downloadpodman-c08e82aa2578270271e23ce6e4fa22509744cc96.tar.gz
podman-c08e82aa2578270271e23ce6e4fa22509744cc96.tar.bz2
podman-c08e82aa2578270271e23ce6e4fa22509744cc96.zip
Merge pull request #8186 from Luap99/fix-8184
Create the default root API address path
Diffstat (limited to 'cmd')
-rw-r--r--cmd/podman/registry/registry.go7
-rw-r--r--cmd/podman/system/service.go17
2 files changed, 12 insertions, 12 deletions
diff --git a/cmd/podman/registry/registry.go b/cmd/podman/registry/registry.go
index 1e439613c..9c0b290e7 100644
--- a/cmd/podman/registry/registry.go
+++ b/cmd/podman/registry/registry.go
@@ -12,8 +12,11 @@ import (
"github.com/spf13/cobra"
)
-// DefaultRootAPIAddress is the default address of the REST socket
-const DefaultRootAPIAddress = "unix:/run/podman/podman.sock"
+// DefaultRootAPIPath is the default path of the REST socket
+const DefaultRootAPIPath = "/run/podman/podman.sock"
+
+// DefaultRootAPIAddress is the default address of the REST socket with unix: prefix
+const DefaultRootAPIAddress = "unix:" + DefaultRootAPIPath
// DefaultVarlinkAddress is the default address of the varlink socket
const DefaultVarlinkAddress = "unix:/run/podman/io.podman"
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go
index 2a2b1984f..0476c632d 100644
--- a/cmd/podman/system/service.go
+++ b/cmd/podman/system/service.go
@@ -131,20 +131,17 @@ func resolveAPIURI(_url []string) (string, error) {
if srvArgs.Varlink {
socketName = "io.podman"
}
- socketDir := filepath.Join(xdg, "podman", socketName)
- if _, err := os.Stat(filepath.Dir(socketDir)); err != nil {
- if os.IsNotExist(err) {
- if err := os.Mkdir(filepath.Dir(socketDir), 0755); err != nil {
- return "", err
- }
- } else {
- return "", err
- }
+ socketPath := filepath.Join(xdg, "podman", socketName)
+ if err := os.MkdirAll(filepath.Dir(socketPath), 0700); err != nil {
+ return "", err
}
- return "unix:" + socketDir, nil
+ return "unix:" + socketPath, nil
case srvArgs.Varlink:
return registry.DefaultVarlinkAddress, nil
default:
+ if err := os.MkdirAll(filepath.Dir(registry.DefaultRootAPIPath), 0700); err != nil {
+ return "", err
+ }
return registry.DefaultRootAPIAddress, nil
}
}