Add support for VSCode remote development

.devcontainer/devcontainer.json

@@ -0,0 +1,33 @@
+// How to get remote container development working with VSCode:
+// 1. Install "Remote Development" extension pack (ms-vscode-remote.vscode-remote-extensionpack)
+// 2. Select "Remote Containers - Reopen in container"
+
+{
+  "name": "Wiki.js",
+  "dockerComposeFile": [
+    "../dev/containers/docker-compose.yml"
+  ],
+  "forwardPorts": [3000, 3001],
+  "service": "wiki",
+  "workspaceFolder": "/wiki",
+  "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"
+],
+  "postCreateCommand": ["yarn", "install"]
+}

dev/docker-postgres/Dockerfile → dev/containers/Dockerfile

@@ -1,17 +1,14 @@
 # -- DEV DOCKERFILE --
 # -- DO NOT USE IN PRODUCTION! --
 
-FROM node:10-alpine
+FROM node:12-alpine
 LABEL maintainer "requarks.io"
 
 RUN apk update && \
     apk add bash curl git python make g++ nano openssh gnupg --no-cache && \
     mkdir -p /wiki
 
 WORKDIR /wiki
-COPY package.json .
-RUN yarn --silent
-COPY ./dev/docker-postgres/init.sh ./init.sh
 
 ENV dockerdev 1
 ENV DEVDB postgres

dev/docker-postgres/docker-compose.yml → dev/containers/docker-compose.yml

@@ -27,40 +27,38 @@ services:
     ports:
       - "3001:8080"
 
-  solr:
-    image: solr:7-alpine
-    logging:
-      driver: "none"
-    networks:
-      - wikinet
-    ports:
-      - "8983:8983"
-    volumes:
-      - solr-data:/opt/solr/server/solr/mycores
-    entrypoint:
-      - docker-entrypoint.sh
-      - solr-precreate
-      - wiki
+  # solr:
+  #   image: solr:7-alpine
+  #   logging:
+  #     driver: "none"
+  #   networks:
+  #     - wikinet
+  #   ports:
+  #     - "8983:8983"
+  #   volumes:
+  #     - solr-data:/opt/solr/server/solr/mycores
+  #   entrypoint:
+  #     - docker-entrypoint.sh
+  #     - solr-precreate
+  #     - wiki
 
   wiki:
     build:
-      context: .
-      dockerfile: dev/docker-postgres/Dockerfile
+      context: ../..
+      dockerfile: dev/containers/Dockerfile
     depends_on:
       - db
-      - solr
     networks:
       - wikinet
     ports:
       - "3000:3000"
     volumes:
-      - .:/wiki
+      - ../..:/wiki
       - /wiki/node_modules
-    command: ["sh", "./dev/docker-postgres/init.sh"]
 
 networks:
   wikinet:
 
 volumes:
   db-data:
-  solr-data:
+  # solr-data: