@@ -279,16 +279,16 @@ func (dcl *DockerCLILister) List(ctx context.Context) (codersdk.WorkspaceAgentLi
279279// will still contain valid JSON. We will just end up missing
280280// information about the removed container. We could potentially
281281// log this error, but I'm not sure it's worth it.
282- ins ,dockerInspectStderr ,err := runDockerInspect (ctx ,dcl .execer ,ids ... )
282+ dockerInspectStdout ,dockerInspectStderr ,err := runDockerInspect (ctx ,dcl .execer ,ids ... )
283283if err != nil {
284284return codersdk.WorkspaceAgentListContainersResponse {},xerrors .Errorf ("run docker inspect: %w" ,err )
285285}
286286
287- if dockerInspectStderr != "" {
288- res .Warnings = append (res .Warnings ,dockerInspectStderr )
287+ if len ( dockerInspectStderr ) > 0 {
288+ res .Warnings = append (res .Warnings ,string ( dockerInspectStderr ) )
289289}
290290
291- outs ,warns ,err := convertDockerInspect (ins )
291+ outs ,warns ,err := convertDockerInspect (dockerInspectStdout )
292292if err != nil {
293293return codersdk.WorkspaceAgentListContainersResponse {},xerrors .Errorf ("convert docker inspect output: %w" ,err )
294294}
@@ -301,19 +301,19 @@ func (dcl *DockerCLILister) List(ctx context.Context) (codersdk.WorkspaceAgentLi
301301// runDockerInspect is a helper function that runs `docker inspect` on the given
302302// container IDs and returns the parsed output.
303303// The stderr output is also returned for logging purposes.
304- func runDockerInspect (ctx context.Context ,execer agentexec.Execer ,ids ... string ) (stdout ,stderr string ,err error ) {
304+ func runDockerInspect (ctx context.Context ,execer agentexec.Execer ,ids ... string ) (stdout ,stderr [] byte ,err error ) {
305305var stdoutBuf ,stderrBuf bytes.Buffer
306306cmd := execer .CommandContext (ctx ,"docker" ,append ([]string {"inspect" },ids ... )... )
307307cmd .Stdout = & stdoutBuf
308308cmd .Stderr = & stderrBuf
309309err = cmd .Run ()
310- stdout = strings .TrimSpace (stdoutBuf .String ())
311- stderr = strings .TrimSpace (stderrBuf .String ())
310+ stdout = bytes .TrimSpace (stdoutBuf .Bytes ())
311+ stderr = bytes .TrimSpace (stderrBuf .Bytes ())
312312if err != nil {
313313return stdout ,stderr ,err
314314}
315315
316- return stdoutBuf . String () ,stderr ,nil
316+ return stdout ,stderr ,nil
317317}
318318
319319// To avoid a direct dependency on the Docker API, we use the docker CLI
@@ -371,10 +371,10 @@ func (dis dockerInspectState) String() string {
371371return sb .String ()
372372}
373373
374- func convertDockerInspect (raw string ) ([]codersdk.WorkspaceAgentDevcontainer , []string ,error ) {
374+ func convertDockerInspect (raw [] byte ) ([]codersdk.WorkspaceAgentDevcontainer , []string ,error ) {
375375var warns []string
376376var ins []dockerInspect
377- if err := json .NewDecoder (strings .NewReader (raw )).Decode (& ins );err != nil {
377+ if err := json .NewDecoder (bytes .NewReader (raw )).Decode (& ins );err != nil {
378378return nil ,nil ,xerrors .Errorf ("decode docker inspect output: %w" ,err )
379379}
380380outs := make ([]codersdk.WorkspaceAgentDevcontainer ,0 ,len (ins ))