fix: move env variables to runOptions

Signed-off-by: Luca Di Maio <luca.dimaio1@gmail.com>

pkg/devcontainer/single.go

@@ -121,6 +121,14 @@ func (r *runner) runContainer(
 		}
 	}
 
+	// add environment variables that signals that we are in a remote container
+	// (vscode compatibility) and specifically that we are using devpod.
+	if runOptions.Env == nil {
+		runOptions.Env = make(map[string]string)
+	}
+	runOptions.Env["DEVPOD"] = "true"
+	runOptions.Env["REMOTE_CONTAINERS"] = "true"
+
 	// check if docker
 	dockerDriver, ok := r.Driver.(driver.DockerDriver)
 	if ok {

pkg/driver/docker/docker.go

@@ -199,11 +199,6 @@ func (d *dockerDriver) RunDockerDevContainer(
 		"--sig-proxy=false",
 	}
 
-	// add environment variables that signals that we are in a remote container
-	// (vscode compatibility) and specifically that we are using devpod.
-	args = append(args, "--env", "DEVPOD=true")
-	args = append(args, "--env", "REMOTE_CONTAINERS=true")
-
 	// add ports
 	for _, appPort := range parsedConfig.AppPort {
 		intPort, err := strconv.Atoi(appPort)