Resolved merge conflicts

.devcontainer/devcontainer.json

@@ -1,10 +1,12 @@
 {
-  "name": "Codespace to bootstrap valet in a Codespace",
-  //Use base codespace image then pull Valet on postCreateCommand,  
-  "image": "mcr.microsoft.com/vscode/devcontainers/universal:linux",
-  "remoteUser": "codespace",
+	"name": "Codespace to bootstrap valet in a Codespace",
+	//Use base codespace image then pull Valet on postCreateCommand,  
+	"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"],
+	"mounts": [
+		"source=codespaces-linux-var-lib-docker,target=/var/lib/docker,type=volume"
+	],
 	"runArgs": [
 		"--cap-add=SYS_PTRACE",
 		"--security-opt",
@@ -12,11 +14,10 @@
 		"--privileged",
 		"--init"
 	],
-	
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
 		"ms-azuretools.vscode-docker",
 	],
 	"onCreateCommand": 'echo "export GITHUB_ACCESS_TOKEN=$VALET_GHCR_PASSWORD" >> ~/.bashrc',
-	"postCreateCommand": "sudo bash .devcontainer/setupcodespace.sh ${VALET_GHCR_PASSWORD} ${AZURE_DEVOPS_PROJECT} ${AZURE_DEVOPS_ORGANIZATION} ${AZURE_DEVOPS_ACCESS_TOKEN} ${GITHUB_USER} ${JENKINS_USERNAME} ${JENKINS_PASSWORD}'https://github.com/' && gh extension install github/gh-valet || echo 'Could not auto-build. Skipping.' "
-}
+	"postCreateCommand": "sudo bash .devcontainer/setupcodespace.sh ${VALET_GHCR_PASSWORD} ${AZURE_DEVOPS_PROJECT} ${AZURE_DEVOPS_ORGANIZATION} ${AZURE_DEVOPS_ACCESS_TOKEN} ${GITHUB_USER} 'https://github.com/' && gh extension install github/gh-valet || echo 'Could not auto-build. Skipping.' "
+}

.devcontainer/setupcodespace.sh

@@ -25,16 +25,4 @@ then
      echo "Error: Set envars not set, valid values not passed in. You will have to manually use the valet/.env.local folder"
 fi
 
-
-# if Jenkins codespace secrets are set, spin up Jenkins instance 
-
-if [ -z "$7" -o -z "$8"]
-then
-else 
-     echo "Jenkins secrets are set, starting Jenkins service"
-     ../jenkins/jenkins_setup/setupjenkins.sh $7 $8
-fi
-
-
-
 echo "Finished setupcodespace.sh"