From c304afad0ced1840f59de2b7d34cea4bd2bb3dce Mon Sep 17 00:00:00 2001
From: Chuck Lantz <clantz@microsoft.com>
Date: Tue, 28 May 2019 12:59:34 -0700
Subject: [PATCH] Move settings into 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 faeeb66..4f95662 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -33,9 +33,6 @@ RUN go get -x -d github.com/stamblerre/gocode 2>&1 \
     && go build -o gocode-gomod github.com/stamblerre/gocode \
     && mv gocode-gomod $GOPATH/bin/
 
-# Copy default endpoint specific user settings overrides into container to specify Go path
-COPY settings.vscode.json /root/.vscode-remote/data/Machine/settings.json
-
 # Install git, process tools, lsb-release (common in install instructions for CLIs)
 RUN apt-get -y install git procps lsb-release
 
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 694be03..a7d3c13 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -9,5 +9,8 @@
 		"--cap-add=SYS_PTRACE",
 		"--security-opt",
 		"seccomp=unconfined"
-	]
+	],
+	"settings": {
+		"go.gopath": "/go"
+	}
 }
\ No newline at end of file
diff --git a/.devcontainer/settings.vscode.json b/.devcontainer/settings.vscode.json
deleted file mode 100644
index 9043898..0000000
--- a/.devcontainer/settings.vscode.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "go.gopath": "/go"
-}
\ No newline at end of file