Merge 965de5c5b5 into cd77f36120

.devcontainer/devcontainer.json

@@ -4,12 +4,12 @@
 
 {
   "name": "Wiki.js",
-  "dockerComposeFile": [
+  "dockerComposeFile": ["../dev/containers/docker-compose.yml"],
-    "../dev/containers/docker-compose.yml"
-  ],
   "forwardPorts": [3000, 3001],
   "service": "wiki",
   "workspaceFolder": "/wiki",
+  "customizations": {
+    "vscode": {
       "settings": {
         "terminal.integrated.shell.linux": "/bin/bash"
       },
@@ -28,6 +28,8 @@
         "mrmlnc.vscode-duplicate",
         "oderwat.indent-rainbow",
         "christian-kohler.npm-intellisense"
-],
+      ]
+    }
+  },
   "postCreateCommand": ["yarn", "install"]
 }