From df70f23040e42e04e0c152230881bcaed932aba7 Mon Sep 17 00:00:00 2001
From: Jon Ayers <jon@coder.com>
Date: Wed, 10 May 2023 02:53:03 +0000
Subject: [PATCH 1/2] chore: add CODER_DEBUG env for additional logging

---
 cli/docker.go           | 21 ++++++++++++++++++---
 dockerutil/container.go |  3 +++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/cli/docker.go b/cli/docker.go
index d88bf3a..d036d6d 100644
--- a/cli/docker.go
+++ b/cli/docker.go
@@ -97,6 +97,7 @@ var (
 	EnvMemory     = "CODER_MEMORY"
 	EnvAddGPU     = "CODER_ADD_GPU"
 	EnvUsrLibDir  = "CODER_USR_LIB_DIR"
+	EnvDebug      = "CODER_DEBUG"
 )
 
 var envboxPrivateMounts = map[string]struct{}{
@@ -126,14 +127,17 @@ type flags struct {
 	addTUN            bool
 	addFUSE           bool
 	addGPU            bool
-	noStartupLogs     bool
 	dockerdBridgeCIDR string
 	boostrapScript    string
-	ethlink           string
 	containerMounts   string
 	hostUsrLibDir     string
 	cpus              int
 	memory            int
+
+	// Test flags.
+	noStartupLogs bool
+	debug         bool
+	ethlink       string
 }
 
 func dockerCmd() *cobra.Command {
@@ -333,6 +337,7 @@ func dockerCmd() *cobra.Command {
 
 	// Test flags.
 	cliflag.BoolVarP(cmd.Flags(), &flags.noStartupLogs, "no-startup-log", "", "", false, "Do not log startup logs. Useful for testing.")
+	cliflag.BoolVarP(cmd.Flags(), &flags.debug, "debug", "", "", false, "Log additional output.")
 	cliflag.StringVarP(cmd.Flags(), &flags.ethlink, "ethlink", "", "", defaultNetLink, "The ethernet link to query for the MTU that is passed to docerd. Used for tests.")
 
 	return cmd
@@ -644,6 +649,15 @@ func runDockerCVM(ctx context.Context, log slog.Logger, client dockerutil.Docker
 
 	blog.Info("Envbox startup complete!")
 
+	// The bootstrap script doesn't return since it execs the agent
+	// meaning that it can get pretty noisy if we were to log by default.
+	// In order to allow users to discern issues getting the bootstrap script
+	// to complete successfully we pipe the output to stdout if
+	// CODER_DEBUG=true.
+	debugWriter := io.Discard
+	if flags.debug {
+		debugWriter = os.Stdout
+	}
 	// Bootstrap the container if a script has been provided.
 	blog.Infof("Bootstrapping workspace...")
 	err = dockerutil.BootstrapContainer(ctx, client, dockerutil.BootstrapConfig{
@@ -654,7 +668,8 @@ func runDockerCVM(ctx context.Context, log slog.Logger, client dockerutil.Docker
 		// to /tmp/coder.XXXX. This causes a race to happen where we finish
 		// downloading the binary but before we can execute systemd remounts
 		// /tmp.
-		Env: []string{fmt.Sprintf("BINARY_DIR=%s", bootDir)},
+		Env:       []string{fmt.Sprintf("BINARY_DIR=%s", bootDir)},
+		StdOutErr: debugWriter,
 	})
 	if err != nil {
 		return xerrors.Errorf("boostrap container: %w", err)
diff --git a/dockerutil/container.go b/dockerutil/container.go
index 49c2c7f..c771cd3 100644
--- a/dockerutil/container.go
+++ b/dockerutil/container.go
@@ -3,6 +3,7 @@ package dockerutil
 import (
 	"context"
 	"fmt"
+	"io"
 	"path/filepath"
 	"strconv"
 	"strings"
@@ -100,6 +101,7 @@ type BootstrapConfig struct {
 	Script      string
 	Env         []string
 	Detach      bool
+	StdOutErr   io.Writer
 }
 
 // BoostrapContainer runs a script inside the container as the provided user.
@@ -119,6 +121,7 @@ func BootstrapContainer(ctx context.Context, client DockerClient, conf Bootstrap
 			Args:        []string{"-s"},
 			Stdin:       strings.NewReader(conf.Script),
 			Env:         conf.Env,
+			StdOutErr:   conf.StdOutErr,
 		})
 		if err != nil {
 			err = xerrors.Errorf("boostrap container (%s): %w", out, err)

From f8bcf91a30669c731c47fb8fef8761e517ddce75 Mon Sep 17 00:00:00 2001
From: Jon Ayers <jon@coder.com>
Date: Wed, 10 May 2023 03:14:36 +0000
Subject: [PATCH 2/2] add env var

---
 cli/docker.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cli/docker.go b/cli/docker.go
index d036d6d..afb82ca 100644
--- a/cli/docker.go
+++ b/cli/docker.go
@@ -337,7 +337,7 @@ func dockerCmd() *cobra.Command {
 
 	// Test flags.
 	cliflag.BoolVarP(cmd.Flags(), &flags.noStartupLogs, "no-startup-log", "", "", false, "Do not log startup logs. Useful for testing.")
-	cliflag.BoolVarP(cmd.Flags(), &flags.debug, "debug", "", "", false, "Log additional output.")
+	cliflag.BoolVarP(cmd.Flags(), &flags.debug, "debug", "", EnvDebug, false, "Log additional output.")
 	cliflag.StringVarP(cmd.Flags(), &flags.ethlink, "ethlink", "", "", defaultNetLink, "The ethernet link to query for the MTU that is passed to docerd. Used for tests.")
 
 	return cmd