14

JamesIves · JamesIves · commit 56ff5960ed57 · 2022-01-06T09:55:40.000-05:00
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,2 +1,2 @@
-ARG VARIANT=12
+ARG VARIANT=14
 FROM mcr.microsoft.com/vscode/devcontainers/typescript-node:${VARIANT}
diff --git a/.devcontainer/base.Dockerfile b/.devcontainer/base.Dockerfile
@@ -1,4 +1,4 @@
-ARG VARIANT=12-buster
+ARG VARIANT=14-buster
 FROM mcr.microsoft.com/vscode/devcontainers/javascript-node:dev-${VARIANT}
 
 # Install tslint, typescript. eslint is installed by javascript image
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,5 +1,6 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/master/containers/typescript-node
 {
+<<<<<<< Updated upstream
   "name": "Node.js & TypeScript",
   "build": {
     "dockerfile": "Dockerfile",
@@ -13,3 +14,20 @@
   "extensions": ["dbaeumer.vscode-eslint"],
   "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

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