From c0c7adf890babba9daf3c181d467185af4459ed8 Mon Sep 17 00:00:00 2001
From: Thomas Schaffter <thomas.schaffter@gmail.com>
Date: Tue, 5 Dec 2023 11:09:31 -0800
Subject: [PATCH] Update devcontainer image (#2392)

---
 .devcontainer/devcontainer.json | 49 ++++++---------------------------
 dev-env.sh                      |  2 +-
 2 files changed, 9 insertions(+), 42 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 58188dcb02..6a26be2101 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -1,6 +1,6 @@
 {
   "name": "Sage Dev Container",
-  "image": "ghcr.io/sage-bionetworks/sage-devcontainer:0d98658",
+  "image": "ghcr.io/sage-bionetworks/sage-devcontainer:be08406",
 
   "containerEnv": {
     "NX_BASE": "${localEnv:NX_BASE}",
@@ -24,9 +24,7 @@
 
   "customizations": {
     "codespaces": {
-      "openFiles": [
-        "README.md"
-      ]
+      "openFiles": ["README.md"]
     },
     "vscode": {
       "extensions": [
@@ -36,7 +34,6 @@
         "eamodio.gitlens",
         "emeraldwalk.RunOnSave",
         "esbenp.prettier-vscode",
-        "firsttris.vscode-jest-runner",
         "formulahendry.auto-rename-tag",
         "github.vscode-github-actions",
         "GitHub.vscode-pull-request-github",
@@ -53,6 +50,7 @@
         "mtxr.sqltools",
         "njpwerner.autodocstring",
         "nrwl.angular-console",
+        "Orta.vscode-jest",
         "pranaygp.vscode-css-peek",
         "ritwickdey.LiveServer",
         "shengchen.vscode-checkstyle",
@@ -70,40 +68,9 @@
   },
 
   "forwardPorts": [
-    3000,
-    3306,
-    4200,
-    4211,
-    5017,
-    5200,
-    5432,
-    5601,
-    7010,
-    7080,
-    7200,
-    7888,
-    8010,
-    8071,
-    8000,
-    8080,
-    8081,
-    8082,
-    8083,
-    8084,
-    8085,
-    8086,
-    8090,
-    8091,
-    8092,
-    8200,
-    8787,
-    8888,
-    8889,
-    9090,
-    9104,
-    9200,
-    9411,
-    27017
+    3000, 3306, 4200, 4211, 5017, 5200, 5432, 5601, 7010, 7080, 7200, 7888, 8010, 8071, 8000, 8080,
+    8081, 8082, 8083, 8084, 8085, 8086, 8090, 8091, 8092, 8200, 8787, 8888, 8889, 9090, 9104, 9200,
+    9411, 27017
   ],
 
   "portsAttributes": {
@@ -249,7 +216,7 @@
     }
   },
 
-	"remoteUser": "vscode",
+  "remoteUser": "vscode",
   "shutdownAction": "stopContainer",
   "runArgs": ["--name", "sage_devcontainer"]
-}
\ No newline at end of file
+}
diff --git a/dev-env.sh b/dev-env.sh
index 7d0aad0929..fd0dd87bee 100644
--- a/dev-env.sh
+++ b/dev-env.sh
@@ -102,7 +102,7 @@ function workspace-nx-cloud-help {
 function version { echo "$@" | awk -F. '{ printf("%d%03d%03d%03d\n", $1,$2,$3,$4); }'; }
 
 function check-vscode-version {
-  expected="1.81.1"
+  expected="1.84.2"
   actual="$(code --version | head -n 1)"
   if [ $(version $actual) -lt $(version $expected) ]; then
     echo "📦 Please update VS Code (${actual}) to version ${expected} or above."