diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-12 07:26:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-12 07:26:37 -0500 |
| commit | 1955eee89f083ec814a44025dc0abe59748205b3 (patch) | |
| tree | 607dcc50c4624067b0e2710f0bbd79a1b4e203a5 /libpod/oci_conmon_linux.go | |
| parent | 56819073147bec22badd6b5e424cd981d3383398 (diff) | |
| parent | fdbc278868fa0e9ea470d77857a7905811d2faa0 (diff) | |
| download | podman-1955eee89f083ec814a44025dc0abe59748205b3.tar.gz podman-1955eee89f083ec814a44025dc0abe59748205b3.tar.bz2 podman-1955eee89f083ec814a44025dc0abe59748205b3.zip | |
Merge pull request #8933 from giuseppe/use-O_PATH-for-unix-sock
oci: use /proc/self/fd/FD to open unix socket
Diffstat (limited to 'libpod/oci_conmon_linux.go')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 16b9f0eac..b7598edad 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -529,13 +529,12 @@ func (r *ConmonOCIRuntime) HTTPAttach(ctr *Container, req *http.Request, w http. if err != nil { return err } - socketPath := buildSocketPath(attachSock) var conn *net.UnixConn if streamAttach { - newConn, err := net.DialUnix("unixpacket", nil, &net.UnixAddr{Name: socketPath, Net: "unixpacket"}) + newConn, err := openUnixSocket(attachSock) if err != nil { - return errors.Wrapf(err, "failed to connect to container's attach socket: %v", socketPath) + return errors.Wrapf(err, "failed to connect to container's attach socket: %v", attachSock) } conn = newConn defer func() { @@ -544,7 +543,7 @@ func (r *ConmonOCIRuntime) HTTPAttach(ctr *Container, req *http.Request, w http. } }() - logrus.Debugf("Successfully connected to container %s attach socket %s", ctr.ID(), socketPath) + logrus.Debugf("Successfully connected to container %s attach socket %s", ctr.ID(), attachSock) } detachString := ctr.runtime.config.Engine.DetachKeys |