fix: gp rebuild

Author: Andrea Falzetti

components/gitpod-cli/cmd/rebuild.go

@@ -79,7 +79,7 @@ func runRebuild(ctx context.Context, supervisorClient *supervisor.SupervisorClie
 		fmt.Println("Alternatively, check out the following docs for getting started configuring your project")
 		fmt.Println("https://www.gitpod.io/docs/configure#configure-gitpod")
 		event.Set("ErrorCode", utils.RebuildErrorCode_MissingGitpodYaml)
-		return err
+		return nil
 	}
 
 	var baseimage string
@@ -109,7 +109,7 @@ func runRebuild(ctx context.Context, supervisorClient *supervisor.SupervisorClie
 			fmt.Println("")
 			fmt.Println("Once you configure your Dockerfile, re-run this command to validate your changes")
 			event.Set("ErrorCode", utils.RebuildErrorCode_DockerfileEmpty)
-			return err
+			return nil
 		}
 		baseimage = "\n" + string(dockerfile) + "\n"
 	default:
@@ -124,10 +124,12 @@ func runRebuild(ctx context.Context, supervisorClient *supervisor.SupervisorClie
 		fmt.Println("")
 		fmt.Println("https://www.gitpod.io/docs/configure/workspaces/workspace-image#use-a-public-docker-image")
 		event.Set("ErrorCode", utils.RebuildErrorCode_NoCustomImage)
-		return err
+		return nil
 	}
 
-	err = os.WriteFile(filepath.Join(tmpDir, "Dockerfile"), []byte(baseimage), 0644)
+	tmpDockerfile := filepath.Join(tmpDir, "Dockerfile")
+
+	err = os.WriteFile(tmpDockerfile, []byte(baseimage), 0644)
 	if err != nil {
 		fmt.Println("Could not write the temporary Dockerfile")
 		event.Set("ErrorCode", utils.RebuildErrorCode_DockerfileCannotWirte)
@@ -143,7 +145,7 @@ func runRebuild(ctx context.Context, supervisorClient *supervisor.SupervisorClie
 
 	tag := "gp-rebuild-temp-build"
 
-	dockerCmd := exec.Command(dockerPath, "build", "-t", tag, "--progress=tty", ".")
+	dockerCmd := exec.Command(dockerPath, "build", "-f", tmpDockerfile, "-t", tag, "--progress=tty", wsInfo.CheckoutLocation)
 	dockerCmd.Dir = tmpDir
 	dockerCmd.Stdout = os.Stdout
 	dockerCmd.Stderr = os.Stderr
@@ -153,7 +155,7 @@ func runRebuild(ctx context.Context, supervisorClient *supervisor.SupervisorClie
 	if _, ok := err.(*exec.ExitError); ok {
 		fmt.Println("Image Build Failed")
 		event.Set("ErrorCode", utils.RebuildErrorCode_DockerBuildFailed)
-		return err
+		return nil
 	} else if err != nil {
 		fmt.Println("Docker error")
 		event.Set("ErrorCode", utils.RebuildErrorCode_DockerErr)
@@ -183,26 +185,24 @@ func runRebuild(ctx context.Context, supervisorClient *supervisor.SupervisorClie
 		"--label", "gp-rebuild=true",
 		"-it",
 		tag,
-		"bash",
+		"sh",
 		"-c",
-		fmt.Sprintf("echo '%s'; bash", welcomeMessage),
+		fmt.Sprintf("echo '%s'; sh", welcomeMessage),
 	)
 
 	dockerRunCmd.Stdout = os.Stdout
 	dockerRunCmd.Stderr = os.Stderr
 	dockerRunCmd.Stdin = os.Stdin
 
-	err = dockerRunCmd.Run()
-	if _, ok := err.(*exec.ExitError); ok {
-		fmt.Println("Docker Run Command Failed")
+	err = dockerRunCmd.Start()
+	if err != nil {
+		fmt.Println("Failed to run docker container")
 		event.Set("ErrorCode", utils.RebuildErrorCode_DockerRunFailed)
 		return err
-	} else if err != nil {
-		fmt.Println("Docker error")
-		event.Set("ErrorCode", utils.RebuildErrorCode_DockerErr)
-		return err
 	}
 
+	_ = dockerRunCmd.Wait()
+
 	return nil
 }