[inner-loop] run Isolated docker in debug workspace

Author: iQQBot

components/gitpod-cli/cmd/rebuild.go

@@ -262,8 +262,10 @@ func runRebuild(ctx context.Context, supervisorClient *supervisor.SupervisorClie
 		// volumes
 		"-v", "/workspace:/workspace",
 		"-v", "/.supervisor:/.supervisor",
-		"-v", "/var/run/docker.sock:/var/run/docker.sock",
 		"-v", "/ide:/ide",
+		"-v", "/usr/bin/docker-up:/usr/bin/docker-up",
+		"-v", "/usr/bin/runc-facade:/usr/bin/runc-facade",
+		"-v", "/usr/local/bin/docker-compose:/usr/local/bin/docker-compose",
 		// "-v", "/ide-desktop:/ide-desktop", // TODO fix desktop IDEs later
 		// "-v", "/ide-desktop-plugins:/ide-desktop-plugins", // TODO refactor to keep all IDE deps under ide or ide-desktop
 

components/supervisor/pkg/supervisor/supervisor.go

@@ -398,9 +398,9 @@ func Run(options ...RunOption) {
 	tasksSuccessChan := make(chan taskSuccess, 1)
 	go taskManager.Run(ctx, &wg, tasksSuccessChan)
 
-	if !opts.RunGP && !cfg.isDebugWorkspace() {
+	if !opts.RunGP {
 		wg.Add(1)
-		go socketActivationForDocker(ctx, &wg, termMux)
+		go socketActivationForDocker(ctx, &wg, termMux, cfg.isDebugWorkspace())
 	}
 
 	if cfg.isHeadless() {
@@ -1499,7 +1499,7 @@ func recordInitializerMetrics(path string, metrics *metrics.SupervisorMetrics) {
 	}
 }
 
-func socketActivationForDocker(ctx context.Context, wg *sync.WaitGroup, term *terminal.Mux) {
+func socketActivationForDocker(ctx context.Context, wg *sync.WaitGroup, term *terminal.Mux, isDebugWorkspace bool) {
 	defer wg.Done()
 
 	fn := "/var/run/docker.sock"
@@ -1521,6 +1521,10 @@ func socketActivationForDocker(ctx context.Context, wg *sync.WaitGroup, term *te
 			cmd := exec.Command("/usr/bin/docker-up")
 			cmd.Env = append(os.Environ(), "LISTEN_FDS=1")
 			cmd.ExtraFiles = []*os.File{socketFD}
+			if isDebugWorkspace {
+				cmd.Args = append(cmd.Args, "--iface", "eth0")
+				cmd.Args = append(cmd.Args, "--data-root", "/workspace/.docker-root-debug")
+			}
 			alias, err := term.Start(cmd, terminal.TermOptions{
 				Annotations: map[string]string{
 					"gitpod.supervisor": "true",