fix config issues

nstoik · Jan 3, 2024 · c90fd87 · c90fd87
1 parent 48614fc
commit c90fd87
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 21 deletions.
diff --git a/1wire/.devcontainer/devcontainer.json b/1wire/.devcontainer/devcontainer.json
@@ -7,7 +7,7 @@
 	 "dockerComposeFile": [
 		"../../docker-compose.yml",
 		"../../docker-compose.dev.yml",
-		"../../docker-compose.devcontainer.yml",
+		"../../docker-compose.devcontainer.yml"
     ],
 
 	//"remoteUser": "fd",
@@ -17,8 +17,12 @@
 	// Otherwise do not need workspaceMount
 	"workspaceMount": "source=/home/ubuntu/farm_device,target=/workspaces,type=bind,consistency=cached",
 	"workspaceFolder": "/workspaces",
-	"shutdownAction": "none",
+	"shutdownAction": "none"
+	// "customizations": {
+	// 	"vscode": {
+	// 		"extensions": []
+	// 	}
+	// }
 
-	"extensions": [],
 	// "postCreateCommand": "git config --global core.autocrlf true && git config --global user.email 'nelsonstoik@gmail.com' && git config --global user.name 'Nelson'",
 }
diff --git a/device/.devcontainer/devcontainer.json b/device/.devcontainer/devcontainer.json
@@ -7,7 +7,7 @@
 	 "dockerComposeFile": [
 		"../../docker-compose.yml",
 		"../../docker-compose.dev.yml",
-		"../../docker-compose.devcontainer.yml",
+		"../../docker-compose.devcontainer.yml"
     ],
 
 	"remoteUser": "fd",
@@ -19,21 +19,25 @@
 	"workspaceFolder": "/workspaces",
 	"shutdownAction": "none",
 
-	"extensions": [
-		"ms-python.python",
-		"eamodio.gitlens",
-		"ms-python.vscode-pylance",
-		"github.copilot",
-	],
-	"postCreateCommand": "git config --global core.autocrlf true && git config --global user.email 'nelsonstoik@gmail.com' && git config --global user.name 'Nelson'",
-	"settings": {
-		"python.linting.enabled": true,
-		"python.linting.pylintEnabled": true,
-		"python.linting.pylintArgs": ["--load-plugins",],
-		"python.linting.flake8Enabled": true,
-		"python.linting.flake8Args": ["--config=/workspaces/device/setup.cfg"],
-		"python.linting.mypyEnabled": true,
-		"python.linting.mypyArgs": ["--config=/workspaces/device/setup.cfg"],
-		"python.formatting.provider": "black"
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-python.python",
+				"eamodio.gitlens",
+				"ms-python.vscode-pylance",
+				"github.copilot"
+			],
+			"postCreateCommand": "git config --global core.autocrlf true && git config --global user.email 'nelsonstoik@gmail.com' && git config --global user.name 'Nelson'",
+			"settings": {
+				"python.linting.enabled": true,
+				"python.linting.pylintEnabled": true,
+				"python.linting.pylintArgs": ["--load-plugins"],
+				"python.linting.flake8Enabled": true,
+				"python.linting.flake8Args": ["--config=/workspaces/device/setup.cfg"],
+				"python.linting.mypyEnabled": true,
+				"python.linting.mypyArgs": ["--config=/workspaces/device/setup.cfg"],
+				"python.formatting.provider": "black"
+			}
+		}
 	}
 }
diff --git a/device/README.md b/device/README.md
@@ -2,4 +2,9 @@
 
 ## Vscode Dev Container
 
-Run ```pipenv install --dev``` inside the container after setting it up
+Run ```pipenv install --dev``` inside the container after setting it up
+
+```bash
+cd device
+pipenv install --dev
+```