From 88775a27a8ff6111e3192fa2c8585bd5b782abc8 Mon Sep 17 00:00:00 2001
From: JP Ungaretti <19893438+jungaretti@users.noreply.github.com>
Date: Tue, 11 Oct 2022 06:12:52 -0700
Subject: [PATCH] Upgrade devcontainer config (#6405)

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

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
deleted file mode 100644
index 34448d38b..000000000
--- a/.devcontainer/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.234.0/containers/go/.devcontainer/base.Dockerfile
-
-# VARIANT Defined in devcontainer.json
-ARG VARIANT="1.18" 
-FROM mcr.microsoft.com/vscode/devcontainers/go:0-${VARIANT}
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index cdb10785e..10bf64350 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,22 +1,24 @@
 {
-    "extensions": [
-		"golang.go"
-	],
-	"build": {
-		"dockerfile": "Dockerfile",
-		"args": {
-			"VARIANT": "1.18"
-		}
+	"image": "mcr.microsoft.com/devcontainers/go:1.18",
+	"features": {
+		"ghcr.io/devcontainers/features/sshd:1": {}
 	},
-	"settings": {
-		"go.toolsManagement.checkForUpdates": "local",
-		"go.useLanguageServer": true,
-		"go.gopath": "/go"
+	"remoteUser": "vscode",
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"golang.go"
+			],
+			"settings": {
+				"go.toolsManagement.checkForUpdates": "local",
+				"go.useLanguageServer": true,
+				"go.gopath": "/go"
+			}
+		}
 	},
 	"runArgs": [
 		"--cap-add=SYS_PTRACE",
 		"--security-opt",
 		"seccomp=unconfined"
-	],
-	"remoteUser": "vscode"
+	]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index 99a52d6d6..000000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "search.exclude": {
-        "vendor/**": true
-    }
-}
\ No newline at end of file