From 56ff5960ed5790ca209be7978b593b474c7620ac Mon Sep 17 00:00:00 2001
From: James Ives <iam@jamesiv.es>
Date: Thu, 6 Jan 2022 09:55:40 -0500
Subject: [PATCH] 14

---
 .devcontainer/Dockerfile        |  2 +-
 .devcontainer/base.Dockerfile   |  2 +-
 .devcontainer/devcontainer.json | 18 ++++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 9cb1cdc9..5c9d734d 100644
--- 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}
\ No newline at end of file
diff --git a/.devcontainer/base.Dockerfile b/.devcontainer/base.Dockerfile
index 16313f77..c1b624ce 100644
--- 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
index 04030ab3..4064346e 100644
--- 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