diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2022-04-27 15:48:04 -0400 |
|---|---|---|
| committer | openshift-cherrypick-robot <> | 2022-05-04 18:59:05 +0000 |
| commit | 6ea122f6e07f8b49f7a07884556ea697827a5052 (patch) | |
| tree | d98a1aa1ff8396ad207631cadd150c1e5033965b /pkg/util | |
| parent | c4357f0f7b7a032908abfab358616d82163eaf9e (diff) | |
| download | podman-6ea122f6e07f8b49f7a07884556ea697827a5052.tar.gz podman-6ea122f6e07f8b49f7a07884556ea697827a5052.tar.bz2 podman-6ea122f6e07f8b49f7a07884556ea697827a5052.zip | |
Report correct RemoteURI
Rather than assuming a filesystem path, the API service URI is recorded
in the libpod runtime configuration and then reported as requested.
Note: All schemes other than "unix" are hard-coded to report URI exists.
Fixes #12023
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/util')
| -rw-r--r-- | pkg/util/utils.go | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 9842a0f73..a0bf8b50d 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -731,29 +731,6 @@ func IDtoolsToRuntimeSpec(idMaps []idtools.IDMap) (convertedIDMap []specs.LinuxI return convertedIDMap } -var socketPath string - -func SetSocketPath(path string) { - socketPath = path -} - -func SocketPath() (string, error) { - if socketPath != "" { - return socketPath, nil - } - xdg, err := GetRuntimeDir() - if err != nil { - return "", err - } - if len(xdg) == 0 { - // If no xdg is returned, assume root socket - xdg = "/run" - } - - // Glue the socket path together - return filepath.Join(xdg, "podman", "podman.sock"), nil -} - func LookupUser(name string) (*user.User, error) { // Assume UID look up first, if it fails lookup by username if u, err := user.LookupId(name); err == nil { |