From 965de5c5b50f3c17a84de5faec54f47612813e4d Mon Sep 17 00:00:00 2001
From: Krystian Chodak <krystianchodak@eurofins.com>
Date: Mon, 18 Sep 2023 11:17:45 +0200
Subject: [PATCH] Fix Dockerfile and devcontainer.json - Change parameter for
 run command from python to python3 - Fix devcontainer settings structure

---
 .devcontainer/devcontainer.json | 44 +++++++++++++++++----------------
 dev/containers/Dockerfile       |  2 +-
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 997523d6..56a6b12a 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -4,30 +4,32 @@
 
 {
   "name": "Wiki.js",
-  "dockerComposeFile": [
-    "../dev/containers/docker-compose.yml"
-  ],
+  "dockerComposeFile": ["../dev/containers/docker-compose.yml"],
   "forwardPorts": [3000, 3001],
   "service": "wiki",
   "workspaceFolder": "/wiki",
-  "settings": {
-    "terminal.integrated.shell.linux": "/bin/bash"
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "terminal.integrated.shell.linux": "/bin/bash"
+      },
+      "extensions": [
+        "EditorConfig.editorconfig",
+        "dbaeumer.vscode-eslint",
+        "christian-kohler.path-intellisense",
+        "mrmlnc.vscode-puglint",
+        "octref.vetur",
+        "dzannotti.vscode-babel-coloring",
+        "wayou.vscode-todo-highlight",
+        "visualstudioexptteam.vscodeintellicode",
+        "lukas-tr.materialdesignicons-intellisense",
+        "codezombiech.gitignore",
+        "kumar-harsh.graphql-for-vscode",
+        "mrmlnc.vscode-duplicate",
+        "oderwat.indent-rainbow",
+        "christian-kohler.npm-intellisense"
+      ]
+    }
   },
-  "extensions": [
-	"EditorConfig.editorconfig",
-	"dbaeumer.vscode-eslint",
-	"christian-kohler.path-intellisense",
-	"mrmlnc.vscode-puglint",
-	"octref.vetur",
-	"dzannotti.vscode-babel-coloring",
-	"wayou.vscode-todo-highlight",
-	"visualstudioexptteam.vscodeintellicode",
-	"lukas-tr.materialdesignicons-intellisense",
-	"codezombiech.gitignore",
-	"kumar-harsh.graphql-for-vscode",
-	"mrmlnc.vscode-duplicate",
-	"oderwat.indent-rainbow",
-	"christian-kohler.npm-intellisense"
-],
   "postCreateCommand": ["yarn", "install"]
 }
diff --git a/dev/containers/Dockerfile b/dev/containers/Dockerfile
index 36a777f8..5d404880 100644
--- a/dev/containers/Dockerfile
+++ b/dev/containers/Dockerfile
@@ -5,7 +5,7 @@ FROM node:18
 LABEL maintainer "requarks.io"
 
 RUN apt-get update && \
-    apt-get install -y bash curl git python make g++ nano openssh-server gnupg && \
+    apt-get install -y bash curl git python3 make g++ nano openssh-server gnupg && \
     mkdir -p /wiki
 
 WORKDIR /wiki