diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-22 00:29:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-22 00:29:52 +0100 |
| commit | aa13779e9e8d5bb6090d514e3aad9387cb0a2d35 (patch) | |
| tree | 062e1f1f8499375c5124487769e13b7b5fb788f1 /pkg/adapter | |
| parent | f63005e0f23ae6a71c2c910014c5e19623272f73 (diff) | |
| parent | d4c2aaf38ad066e742dad530535faade39dadd1a (diff) | |
| download | podman-aa13779e9e8d5bb6090d514e3aad9387cb0a2d35.tar.gz podman-aa13779e9e8d5bb6090d514e3aad9387cb0a2d35.tar.bz2 podman-aa13779e9e8d5bb6090d514e3aad9387cb0a2d35.zip | |
Merge pull request #4899 from baude/apiv2service
Apiv2service
Diffstat (limited to 'pkg/adapter')
| -rw-r--r-- | pkg/adapter/client.go | 2 | ||||
| -rw-r--r-- | pkg/adapter/client_config.go | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkg/adapter/client.go b/pkg/adapter/client.go index da4670892..5774ebe72 100644 --- a/pkg/adapter/client.go +++ b/pkg/adapter/client.go @@ -57,7 +57,7 @@ func (r RemoteRuntime) RemoteEndpoint() (remoteEndpoint *Endpoint, err error) { // last resort is to make a socket connection with the default varlink address for root user } else { logrus.Debug("creating a varlink address based default root address") - remoteEndpoint, err = newSocketConnection(DefaultAddress) + remoteEndpoint, err = newSocketConnection(DefaultVarlinkAddress) } return } diff --git a/pkg/adapter/client_config.go b/pkg/adapter/client_config.go index 3559b16e3..8187b03b1 100644 --- a/pkg/adapter/client_config.go +++ b/pkg/adapter/client_config.go @@ -1,7 +1,10 @@ package adapter -// DefaultAddress is the default address of the varlink socket -const DefaultAddress = "unix:/run/podman/io.podman" +// DefaultAPIAddress is the default address of the REST socket +const DefaultAPIAddress = "unix:/run/podman/podman.sock" + +// DefaultVarlinkAddress is the default address of the varlink socket +const DefaultVarlinkAddress = "unix:/run/podman/io.podman" // EndpointType declares the type of server connection type EndpointType int |