From 6bb43b21e14662f550c687d41f70e88e7eed4a77 Mon Sep 17 00:00:00 2001
From: Spenser Bushey <spenser@spenserbushey.com>
Date: Tue, 13 Dec 2022 16:48:10 -0800
Subject: [PATCH] Working reliably with local containers

---
 .devcontainer/devcontainer.json | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 43bb2dcd4..6f85caf37 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -7,21 +7,13 @@
     "features": {
         "fish": "latest"
 	},
-	"extensions": [
-		"eamodio.gitlens"
+    "extensions": [
+        "eamodio.gitlens"
     ],
     "remoteUser": "node",
-    // "postStartCommand": [
-    //     "git",
-    //     "config",
-    //     "--global",
-    //     "--add",
-    //     "safe.directory",
-    //     "${containerWorkspaceFolder}"
-    // ],
     "postStartCommand": {
-        // "git": "git config --global --add safe.directory ${containerWorkspaceFolder}",
-        "server": "cd ${containerWorkspaceFolder} && sudo chown $(id -u):$(id -g) node_modules && npm i --from-lockfile",
-        "client": "cd ${containerWorkspaceFolder}/client && sudo chown $(id -u):$(id -g) node_modules && npm i --from-lockfile && npm run generate"
+        "git": "git config --global --add safe.directory ${containerWorkspaceFolder}",
+        "server": "cd ${containerWorkspaceFolder} && sudo chown $(id -u):$(id -g) node_modules && npm i",
+        "client": "cd ${containerWorkspaceFolder}/client && sudo chown $(id -u):$(id -g) node_modules && npm i && npm run generate"
     }
 }
\ No newline at end of file