From 5aa924396ea1be938d5c29ae6d7f5d5719f5c128 Mon Sep 17 00:00:00 2001 From: Tierney Cyren Date: Mon, 15 Nov 2021 18:39:09 -0500 Subject: [PATCH 1/6] build: don't ignore devcontainer Signed-off-by: Tierney Cyren --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index b7a33d86bedf61..2eea6b83b94b36 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,8 @@ .* # Exclude specific dotfiles that we want to track. !deps/**/.* +!.devcontainer/ +!.devcontainer/.devcontainer.json !test/fixtures/**/.* !.clang-format !.cpplint From c143e960191a43d03c70d790a2494ddbb0141e59 Mon Sep 17 00:00:00 2001 From: Tierney Cyren Date: Mon, 15 Nov 2021 18:39:26 -0500 Subject: [PATCH 2/6] build: add devcontainer configs Signed-off-by: Tierney Cyren --- .devcontainer/.devcontainer.json | 20 ++++++++++++++++++++ .devcontainer/Dockerfile | 3 +++ 2 files changed, 23 insertions(+) create mode 100644 .devcontainer/.devcontainer.json create mode 100644 .devcontainer/Dockerfile diff --git a/.devcontainer/.devcontainer.json b/.devcontainer/.devcontainer.json new file mode 100644 index 00000000000000..fde951054d6a33 --- /dev/null +++ b/.devcontainer/.devcontainer.json @@ -0,0 +1,20 @@ +{ + "name": "Node.js Core Developer Environment", + "extensions": [ + "eamodio.gitlens", + "github.vscode-pull-request-github", + "ms-vsliveshare.vsliveshare", + "vscode-icons-team.vscode-icons", + "visualstudioexptteam.vscodeintellicode" + ], + "dockerFile": "Dockerfile", + "initializeCommand": "docker system prune -f -a", + "settings": { + "terminal.integrated.profiles.linux": { + "zsh (login)": { + "path": "zsh", + "args": ["-l"] + } + } + } + } diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile new file mode 100644 index 00000000000000..e56566bf9fd032 --- /dev/null +++ b/.devcontainer/Dockerfile @@ -0,0 +1,3 @@ +FROM nodejs/devcontainer:latest + +WORKDIR /home/developer/nodejs/node From 9c0b7e30e0fa387a5399b472afe49aecbd61fe4f Mon Sep 17 00:00:00 2001 From: Tierney Cyren Date: Tue, 16 Nov 2021 13:36:19 -0500 Subject: [PATCH 3/6] build: fix inconsistent spacing Signed-off-by: Tierney Cyren --- .devcontainer/.devcontainer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.devcontainer/.devcontainer.json b/.devcontainer/.devcontainer.json index fde951054d6a33..8336fafa9bfbae 100644 --- a/.devcontainer/.devcontainer.json +++ b/.devcontainer/.devcontainer.json @@ -10,11 +10,11 @@ "dockerFile": "Dockerfile", "initializeCommand": "docker system prune -f -a", "settings": { - "terminal.integrated.profiles.linux": { - "zsh (login)": { - "path": "zsh", - "args": ["-l"] - } + "terminal.integrated.profiles.linux": { + "zsh (login)": { + "path": "zsh", + "args": ["-l"] } } + } } From 4d90714416d139ce4b28625ece67f0d38389bcc3 Mon Sep 17 00:00:00 2001 From: Tierney Cyren Date: Mon, 6 Jun 2022 16:29:04 -0400 Subject: [PATCH 4/6] chore: remove unnessary WORKDIR Signed-off-by: Tierney Cyren --- .devcontainer/Dockerfile | 2 -- devcontainer | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) create mode 160000 devcontainer diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index e56566bf9fd032..b343c3139a720a 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,3 +1 @@ FROM nodejs/devcontainer:latest - -WORKDIR /home/developer/nodejs/node diff --git a/devcontainer b/devcontainer new file mode 160000 index 00000000000000..45a5a30a5394fa --- /dev/null +++ b/devcontainer @@ -0,0 +1 @@ +Subproject commit 45a5a30a5394faa0161efd35af3dbfb50b319472 From 63e54ed1db0797280648b2f9c283c2afa095c88d Mon Sep 17 00:00:00 2001 From: Tierney Cyren Date: Mon, 10 Oct 2022 18:33:42 +0200 Subject: [PATCH 5/6] build: tweaks to various devcontainer configs Signed-off-by: Tierney Cyren --- .devcontainer/.devcontainer.json | 11 +++++------ .devcontainer/Dockerfile | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.devcontainer/.devcontainer.json b/.devcontainer/.devcontainer.json index 8336fafa9bfbae..2e3cde606ce422 100644 --- a/.devcontainer/.devcontainer.json +++ b/.devcontainer/.devcontainer.json @@ -1,7 +1,6 @@ { "name": "Node.js Core Developer Environment", "extensions": [ - "eamodio.gitlens", "github.vscode-pull-request-github", "ms-vsliveshare.vsliveshare", "vscode-icons-team.vscode-icons", @@ -10,11 +9,11 @@ "dockerFile": "Dockerfile", "initializeCommand": "docker system prune -f -a", "settings": { - "terminal.integrated.profiles.linux": { - "zsh (login)": { - "path": "zsh", - "args": ["-l"] - } + "terminal.integrated.profiles.linux": { + "zsh (login)": { + "path": "zsh", + "args": ["-l"] } } } +} diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index b343c3139a720a..3e8e7ecbfbcbdd 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1 +1 @@ -FROM nodejs/devcontainer:latest +FROM nodejs/devcontainer:nightly From b12a91269ca50e73db2562517173247c5e0be881 Mon Sep 17 00:00:00 2001 From: Tierney Cyren Date: Mon, 10 Oct 2022 22:21:39 +0200 Subject: [PATCH 6/6] build: remove erroneous devcontainer submodule Signed-off-by: Tierney Cyren --- devcontainer | 1 - 1 file changed, 1 deletion(-) delete mode 160000 devcontainer diff --git a/devcontainer b/devcontainer deleted file mode 160000 index 45a5a30a5394fa..00000000000000 --- a/devcontainer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 45a5a30a5394faa0161efd35af3dbfb50b319472