Rename temp local cli path to avoid clashes (#177)

* Rename temp local cli path to avoid clashes Change the name for the path used to embed the CLI for dev/test purposes to reduce the chance of conflicts with paths in user repos * Be explicit about root user
devcontainers · Oct 28, 2022 · 3dcee0e · 3dcee0e
1 parent c591d20
commit 3dcee0e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/azdo-task/DevcontainersCi/dist/index.js b/azdo-task/DevcontainersCi/dist/index.js
@@ -16930,13 +16930,13 @@ function installCli(exec) {
         // if we have a local 'cli' folder, then use that as we're testing a private cli build
         let cliStat = null;
         try {
-            cliStat = yield fstat('./cli');
+            cliStat = yield fstat('./_devcontainer_cli');
         }
         catch (_a) {
         }
         if (cliStat && cliStat.isDirectory()) {
             console.log('** Installing local cli');
-            const { exitCode, stdout, stderr } = yield exec('bash', ['-c', 'cd cli && npm install && npm install -g'], {});
+            const { exitCode, stdout, stderr } = yield exec('bash', ['-c', 'cd _devcontainer_cli && npm install && npm install -g'], {});
             if (exitCode != 0) {
                 console.log(stdout);
                 console.error(stderr);

diff --git a/azdo-task/DevcontainersCi/dist/index.js.map b/azdo-task/DevcontainersCi/dist/index.js.map
diff --git a/common/src/dev-container-cli.ts b/common/src/dev-container-cli.ts
@@ -40,12 +40,12 @@ async function installCli(exec: ExecFunction): Promise<boolean> {
   // if we have a local 'cli' folder, then use that as we're testing a private cli build
   let cliStat = null;
   try {
-    cliStat = await fstat('./cli');
+    cliStat = await fstat('./_devcontainer_cli');
   } catch {
   }
   if (cliStat && cliStat.isDirectory()) {
     console.log('** Installing local cli');
-    const {exitCode, stdout, stderr} = await exec('bash', ['-c', 'cd cli && npm install && npm install -g'], {});
+    const {exitCode, stdout, stderr} = await exec('bash', ['-c', 'cd _devcontainer_cli && npm install && npm install -g'], {});
     if (exitCode != 0) {
       console.log(stdout);
       console.error(stderr);

diff --git a/common_lib/dev-container-cli.js b/common_lib/dev-container-cli.js
@@ -47,13 +47,13 @@ function installCli(exec) {
         // if we have a local 'cli' folder, then use that as we're testing a private cli build
         let cliStat = null;
         try {
-            cliStat = yield fstat('./cli');
+            cliStat = yield fstat('./_devcontainer_cli');
         }
         catch (_a) {
         }
         if (cliStat && cliStat.isDirectory()) {
             console.log('** Installing local cli');
-            const { exitCode, stdout, stderr } = yield exec('bash', ['-c', 'cd cli && npm install && npm install -g'], {});
+            const { exitCode, stdout, stderr } = yield exec('bash', ['-c', 'cd _devcontainer_cli && npm install && npm install -g'], {});
             if (exitCode != 0) {
                 console.log(stdout);
                 console.error(stderr);

diff --git a/github-action/dist/index.js b/github-action/dist/index.js
diff --git a/github-action/dist/index.js.map b/github-action/dist/index.js.map
diff --git a/github-tests/Dockerfile/docker-from-docker-root/.devcontainer/devcontainer.json b/github-tests/Dockerfile/docker-from-docker-root/.devcontainer/devcontainer.json
@@ -52,7 +52,7 @@
 	// Use 'postCreateCommand' to run commands after the container is created.
 	"postCreateCommand": "./scripts/go-tools.sh",
 
-	// "remoteUser": "vscode",
+	"remoteUser": "root",
 
 	"extensions": [
 		"golang.go",