From 9e2d16b5218aa57b1113e4eac6d050e9ff2eb160 Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Tue, 28 May 2019 20:17:31 +0000
Subject: [PATCH] Move settings to devcontainer.json

---
 .devcontainer/Dockerfile           | 3 ---
 .devcontainer/devcontainer.json    | 5 ++++-
 .devcontainer/settings.vscode.json | 3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)
 delete mode 100644 .devcontainer/settings.vscode.json

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 0a9d0f3..c2f8464 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -5,9 +5,6 @@
 
 FROM python:3
 
-# Copy default endpoint specific user settings overrides into container to specify Python path
-COPY .devcontainer/settings.vscode.json /root/.vscode-remote/data/Machine/settings.json
-
 # Install pylint
 RUN pip install pylint
 
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 38c5c32..ff9adb8 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -5,5 +5,8 @@
 	"context": "..",
 	"extensions": [
 		"ms-python.python"
-	]
+	],
+	"settings": {
+		"python.pythonPath": "/usr/local/bin/python"
+	}
 }
diff --git a/.devcontainer/settings.vscode.json b/.devcontainer/settings.vscode.json
deleted file mode 100644
index 8ad19d5..0000000
--- a/.devcontainer/settings.vscode.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "python.pythonPath": "/usr/local/bin/python"
-}
\ No newline at end of file