This commit is contained in:
James Ives 2022-01-06 09:55:40 -05:00
parent c9ee890462
commit 56ff5960ed
3 changed files with 20 additions and 2 deletions

View File

@ -1,2 +1,2 @@
ARG VARIANT=12 ARG VARIANT=14
FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:${VARIANT} FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:${VARIANT}

View File

@ -1,4 +1,4 @@
ARG VARIANT=12-buster ARG VARIANT=14-buster
FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:dev-${VARIANT} FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:dev-${VARIANT}
# Install tslint, typescript. eslint is installed by javascript image # Install tslint, typescript. eslint is installed by javascript image

View File

@ -1,5 +1,6 @@
// https://github.com/microsoft/vscode-dev-containers/tree/master/containers/typescript-node // https://github.com/microsoft/vscode-dev-containers/tree/master/containers/typescript-node
{ {
<<<<<<< Updated upstream
"name": "Node.js & TypeScript", "name": "Node.js & TypeScript",
"build": { "build": {
"dockerfile": "Dockerfile", "dockerfile": "Dockerfile",
@ -13,3 +14,20 @@
"extensions": ["dbaeumer.vscode-eslint"], "extensions": ["dbaeumer.vscode-eslint"],
"remoteUser": "node" "remoteUser": "node"
} }
=======
"name": "Node.js & TypeScript",
"build": {
"dockerfile": "Dockerfile",
"args": {
"VARIANT": "14"
}
},
"settings": {
"terminal.integrated.shell.linux": "/bin/bash"
},
"extensions": [
"dbaeumer.vscode-eslint"
],
"remoteUser": "node"
}
>>>>>>> Stashed changes