api/pkg/stdcopy: move stdWriter to daemon/internal

Clients have no need for muxing streams using our StdCopy wire format.

Signed-off-by: Cory Snider <csnider@mirantis.com>
This commit is contained in:
Cory Snider
2025-10-09 19:45:01 -04:00
parent 6e4684459d
commit 4c6e571d38
8 changed files with 123 additions and 167 deletions

View File

@@ -10,6 +10,7 @@ import (
containertypes "github.com/moby/moby/api/types/container"
"github.com/moby/moby/api/types/events"
"github.com/moby/moby/v2/daemon/container"
"github.com/moby/moby/v2/daemon/internal/stdcopymux"
"github.com/moby/moby/v2/daemon/internal/stream"
"github.com/moby/moby/v2/daemon/logger"
"github.com/moby/moby/v2/daemon/server/backend"
@@ -74,8 +75,8 @@ func (daemon *Daemon) ContainerAttach(prefixOrName string, req *backend.Containe
defer inStream.Close()
if multiplexed {
errStream = stdcopy.NewStdWriter(errStream, stdcopy.Stderr)
outStream = stdcopy.NewStdWriter(outStream, stdcopy.Stdout)
errStream = stdcopymux.NewStdWriter(errStream, stdcopy.Stderr)
outStream = stdcopymux.NewStdWriter(outStream, stdcopy.Stdout)
}
if cfg.UseStdin {