diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-05 04:44:35 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-05 04:44:35 -0400 |
| commit | 8081d921b2bf39a418155a6822e55f3392ad63f6 (patch) | |
| tree | c59534a6678522e57afabe54be6bde3ca5a6768b /pkg/util/utils.go | |
| parent | a3908b009a16c4a946a639e90ef49f609ea68aa8 (diff) | |
| parent | 6ea122f6e07f8b49f7a07884556ea697827a5052 (diff) | |
| download | podman-8081d921b2bf39a418155a6822e55f3392ad63f6.tar.gz podman-8081d921b2bf39a418155a6822e55f3392ad63f6.tar.bz2 podman-8081d921b2bf39a418155a6822e55f3392ad63f6.zip | |
Merge pull request #14119 from openshift-cherrypick-robot/cherry-pick-14037-to-v4.1
[v4.1] Report correct RemoteURI
Diffstat (limited to 'pkg/util/utils.go')
| -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 { |