Merge pull request #5833 from smithellis/update-devcontainer

Updated devcontainer.json to comply with vscode requirements
mozilla · Jan 10, 2024 · b051d28 · b051d28
2 parents c2d8354 + a88f294
commit b051d28
Showing 1 changed file with 38 additions and 40 deletions.
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -3,53 +3,51 @@
 // If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml.
 {
     "name": "Kitsune",
-
     // Update the 'dockerComposeFile' list if you have more compose files or use different names.
     // The .devcontainer/docker-compose.yml file contains any overrides you need/want to make.
-    "dockerComposeFile": ["../docker-compose.yml", "docker-compose.yml"],
-
+    "dockerComposeFile": [
+        "../docker-compose.yml",
+        "docker-compose.yml"
+    ],
     // The 'service' property is the name of the service for the container that VS Code should
     // use. Update this value and .devcontainer/docker-compose.yml to the real service name.
     "service": "web",
-
     // The optional 'workspaceFolder' property is the path VS Code should open by default when
     // connected. This is typically a file mount in .devcontainer/docker-compose.yml
     "workspaceFolder": "/app",
-
     // Set *default* container specific settings.json values on container create.
-    "settings": {
-        "terminal.integrated.shell.linux": "/bin/bash"
-    },
-
-    // Add the IDs of extensions you want installed when the container is created.
-    "extensions": [
-		"visualstudioexptteam.vscodeintellicode",
-		"ms-python.python",
-		"ms-python.vscode-pylance",
-		"esbenp.prettier-vscode",
-		"eamodio.gitlens",
-		"ms-azuretools.vscode-docker",
-		"redhat.vscode-yaml",
-		"ms-vscode.vscode-typescript-next",
-		"donjayamanne.python-extension-pack",
-		"wholroyd.jinja",
-		"ms-vscode.js-debug-nightly",
-		"vscode-icons-team.vscode-icons",
-		"syler.sass-indented",
-		"hookyqr.beautify",
-		"samuelcolvin.jinjahtml",
-        "svelte.svelte-vscode",
-	],
-
-    // Uncomment the next line if you want start specific services in your Docker Compose config.
-    "runServices": ["web"],
-
-    // Uncomment the next line if you want to keep your containers running after VS Code shuts down.
-    "shutdownAction": "none",
-
-    // Uncomment the next line to run commands after the container is created - for example installing git.
-    "postCreateCommand": "./bin/run-bootstrap.sh",
-
-    // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
-    "remoteUser": "kitsune"
+    "customizations": {
+        "vscode/settings": {
+            "terminal.integrated.shell.linux": "/bin/bash"
+        },
+        // Add the IDs of extensions you want installed when the container is created.
+        "extensions": [
+            "visualstudioexptteam.vscodeintellicode",
+            "ms-python.python",
+            "ms-python.vscode-pylance",
+            "esbenp.prettier-vscode",
+            "eamodio.gitlens",
+            "ms-azuretools.vscode-docker",
+            "redhat.vscode-yaml",
+            "ms-vscode.vscode-typescript-next",
+            "donjayamanne.python-extension-pack",
+            "wholroyd.jinja",
+            "ms-vscode.js-debug-nightly",
+            "vscode-icons-team.vscode-icons",
+            "syler.sass-indented",
+            "hookyqr.beautify",
+            "samuelcolvin.jinjahtml",
+            "svelte.svelte-vscode"
+        ],
+        // Uncomment the next line if you want start specific services in your Docker Compose config.
+        "runServices": [
+            "web"
+        ],
+        // Uncomment the next line if you want to keep your containers running after VS Code shuts down.
+        "shutdownAction": "none",
+        // Uncomment the next line to run commands after the container is created - for example installing git.
+        "postCreateCommand": "./bin/run-bootstrap.sh",
+        // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
+        "remoteUser": "kitsune"
+    }
 }