From f848c682f3192a7dbb932535c649d101734d4b09 Mon Sep 17 00:00:00 2001
From: Ethan Dennis <erdennis13@gmail.com>
Date: Mon, 19 Sep 2022 12:55:34 -0700
Subject: [PATCH 1/4] Set DOCKER_ARGS variable in codespace

---
 .devcontainer/devcontainer.json | 3 +++
 gitlab/bootstrap/setup.sh       | 4 ----
 jenkins/bootstrap/setup.sh      | 4 ----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index f1f0b7a..40f6a92 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -13,6 +13,9 @@
 		"--privileged",
 		"--init"
 	],
+	"remoteEnv": {
+    "DOCKER_ARGS": "--network=host"
+	},
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
 		"ms-azuretools.vscode-docker"
diff --git a/gitlab/bootstrap/setup.sh b/gitlab/bootstrap/setup.sh
index 021ce64..27006ba 100755
--- a/gitlab/bootstrap/setup.sh
+++ b/gitlab/bootstrap/setup.sh
@@ -33,10 +33,6 @@ else
   docker exec -it gitlab update-permissions &> /dev/null
 fi
 
-# allow valet to talk to GitLab by removing network isolation between containers
-export DOCKER_ARGS="--network=host"
-`grep -q "export DOCKER_ARGS=" ~/.bashrc || echo 'export DOCKER_ARGS="--network=host"' >> ~/.bashrc`
-
 echo -e "Waiting for GitLab to be ready. This might take a while \U23F0"
 until $(curl --output /dev/null --silent --head --fail http://localhost); do
   printf '.'
diff --git a/jenkins/bootstrap/setup.sh b/jenkins/bootstrap/setup.sh
index 5947fa4..e843745 100755
--- a/jenkins/bootstrap/setup.sh
+++ b/jenkins/bootstrap/setup.sh
@@ -18,10 +18,6 @@ else
   docker run -d --name jenkins -p 8080:8080 --env JENKINS_ADMIN_ID=$username --env JENKINS_ADMIN_PASSWORD=$password jenkins:$container_name
 fi
 
-# allow valet to talk to Jenkins by removing network isolation between containers
-export DOCKER_ARGS="--network=host"
-grep -q "export DOCKER_ARGS=" ~/.bashrc || echo 'export DOCKER_ARGS="--network=host"' >> ~/.bashrc
-
 echo -e "\nWaiting for Jenkins to start..."
 while ! curl -s http://localhost:8080/ > /dev/null; do
   printf "."

From f7a72f901ddbdf54bbcd97fe5cf39973c6ff884b Mon Sep 17 00:00:00 2001
From: Ethan Dennis <erdennis13@gmail.com>
Date: Mon, 19 Sep 2022 14:02:05 -0700
Subject: [PATCH 2/4] Add default settings in codespace

---
 .devcontainer/devcontainer.json | 44 +++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 40f6a92..4f970ad 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,23 +2,29 @@
   "name": "Codespace to perform Valet Labs",
   "image": "mcr.microsoft.com/vscode/devcontainers/universal:linux",
   "remoteUser": "codespace",
-	"overrideCommand": false,
-	"mounts": [
-		"source=codespaces-linux-var-lib-docker,target=/var/lib/docker,type=volume"
-	],
-	"runArgs": [
-		"--cap-add=SYS_PTRACE",
-		"--security-opt",
-		"seccomp=unconfined",
-		"--privileged",
-		"--init"
-	],
-	"remoteEnv": {
+  "overrideCommand": false,
+  "mounts": [
+    "source=codespaces-linux-var-lib-docker,target=/var/lib/docker,type=volume"
+  ],
+  "runArgs": [
+    "--cap-add=SYS_PTRACE",
+    "--security-opt",
+    "seccomp=unconfined",
+    "--privileged",
+    "--init"
+  ],
+  "remoteEnv": {
     "DOCKER_ARGS": "--network=host"
-	},
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [
-		"ms-azuretools.vscode-docker"
-	],
-	"postCreateCommand": "gh extension install github/gh-valet || echo 'Could not auto-build. Skipping.' "
-}
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "files.autoSave": "onFocusChange"
+      },
+      "extensions": [
+        "ms-azuretools.vscode-docker"
+      ]
+    }
+  },
+  "postCreateCommand": "gh extension install github/gh-valet || echo 'Could not auto-build. Skipping.' "
+}
\ No newline at end of file

From 216b844d6bd75485acdfbb192a0b73c003360f4b Mon Sep 17 00:00:00 2001
From: Ethan Dennis <erdennis13@gmail.com>
Date: Mon, 19 Sep 2022 15:19:57 -0700
Subject: [PATCH 3/4] Set installation_type to labs

---
 .devcontainer/devcontainer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 4f970ad..ba5c350 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -14,7 +14,8 @@
     "--init"
   ],
   "remoteEnv": {
-    "DOCKER_ARGS": "--network=host"
+    "DOCKER_ARGS": "--network=host",
+    "INSTALLATION_TYPE": "labs"
   },
   "customizations": {
     "vscode": {

From 59b717f5460cf60b1a56239276a9866a75ee8d78 Mon Sep 17 00:00:00 2001
From: Ethan Dennis <ethanis@github.com>
Date: Mon, 19 Sep 2022 16:46:46 -0700
Subject: [PATCH 4/4] Update .devcontainer/devcontainer.json

Co-authored-by: Luke Cheung Engle <99493186+luke-engle@users.noreply.github.com>
---
 .devcontainer/devcontainer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index ba5c350..7145591 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -20,7 +20,8 @@
   "customizations": {
     "vscode": {
       "settings": {
-        "files.autoSave": "onFocusChange"
+        "files.autoSave": "onFocusChange",
+        "editor.tabSize": 2
       },
       "extensions": [
         "ms-azuretools.vscode-docker"