docker run

Author: Andrea Falzetti

components/gitpod-cli/cmd/rebuild.go

@@ -11,6 +11,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 	"time"
 
 	"github.com/gitpod-io/gitpod/gitpod-cli/pkg/supervisor"
@@ -19,6 +20,34 @@ import (
 	"github.com/spf13/cobra"
 )
 
+func TerminateExistingContainer() error {
+	cmd := exec.Command("docker", "ps", "-q", "-f", "label=gp-rebuild")
+	containerIds, err := cmd.Output()
+	if err != nil {
+		return err
+	}
+
+	for _, id := range strings.Split(string(containerIds), "\n") {
+		if len(id) == 0 {
+			continue
+		}
+
+		cmd = exec.Command("docker", "stop", id)
+		err := cmd.Run()
+		if err != nil {
+			return err
+		}
+
+		cmd = exec.Command("docker", "rm", "-f", id)
+		err = cmd.Run()
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
 var buildCmd = &cobra.Command{
 	Use:    "rebuild",
 	Short:  "Re-builds the workspace image (useful to debug a workspace custom image)",
@@ -140,13 +169,6 @@ var buildCmd = &cobra.Command{
 		dockerCmd.Stdout = os.Stdout
 		dockerCmd.Stderr = os.Stderr
 
-		go func() {
-			<-ctx.Done()
-			if proc := dockerCmd.Process; proc != nil {
-				_ = proc.Kill()
-			}
-		}()
-
 		err = dockerCmd.Run()
 		if _, ok := err.(*exec.ExitError); ok {
 			fmt.Println("Image Build Failed")
@@ -160,19 +182,29 @@ var buildCmd = &cobra.Command{
 			return
 		}
 
-		// TODO: add message to suggest how to exit
-		// TODO: add docker run
+		err = TerminateExistingContainer()
+		if err != nil {
+			utils.LogError(ctx, err, "Failed to stop previous gp rebuild container", client)
+		}
+
+		messages := []string{
+			"\n\nYou are now connected to the container",
+			"You can inspect the container and make sure the necessary tools & libraries are installed.",
+			"When you are done, just type exit to return to your Gitpod workspace\n",
+		}
+
+		welcomeMessage := strings.Join(messages, "\n")
+
 		dockerRunCmd := exec.Command(
 			dockerPath,
 			"run",
 			"--rm",
-			// "--user", "root",
-			// "--privileged",
-			// "--label", "gp-rebuild=true",
-			// "--name", tag,
+			"--label", "gp-rebuild=true",
 			"-it",
 			tag,
 			"bash",
+			"-c",
+			fmt.Sprintf("echo '%s'; bash", welcomeMessage),
 		)
 
 		dockerRunCmd.Stdout = os.Stdout