Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename temp local cli path to avoid clashes #177

Merged
merged 2 commits into from
Oct 28, 2022
Merged

Rename temp local cli path to avoid clashes #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c45c92
Rename temp local cli path to avoid clashes
stuartleeks Oct 28, 2022
edbec44
Be explicit about root user
stuartleeks Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions azdo-task/DevcontainersCi/dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion azdo-task/DevcontainersCi/dist/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions common/src/dev-container-cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions common_lib/dev-container-cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions github-action/dist/index.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion github-action/dist/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion github-tests/Dockerfile/docker-from-docker-root/.devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down