Merge pull request #2660 from Scherdel/master

Fixed endless compilation devcontainer and added debugging launch.conf

.devcontainer/Dockerfile

@@ -1,7 +1,7 @@
 FROM ubuntu:disco
 LABEL maintainer="sgr"
 
-ENV BUILD_DEPS="gnupg gosu bsdtar wget curl bzip2 g++ build-essential python git ca-certificates"
+ENV BUILD_DEPS="gnupg gosu bsdtar wget curl bzip2 g++ build-essential python git ca-certificates iproute2"
 ENV DEBIAN_FRONTEND=noninteractive
 
 ENV \
@@ -145,3 +145,16 @@ RUN set -o xtrace \
   && sh /home/wekan/install-meteor.sh
 
 ENV PATH=$PATH:$HOME/.meteor/
+
+# Copy source dir
+USER root
+
+RUN set -o xtrace \
+  && mkdir /home/wekan/app
+
+COPY ${SRC_PATH} /home/wekan/app/
+
+RUN set -o xtrace \
+  && chown -R wekan:wekan /home/wekan/app /home/wekan/.meteor
+
+USER wekan

.devcontainer/build.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cd /app
+cd /home/wekan/app
 rm -rf node_modules
 /home/wekan/.meteor/meteor npm install
 rm -rf .build
@@ -9,4 +9,4 @@ cp -f fix-download-unicode/cfs_access-point.txt .build/bundle/programs/server/pa
 cd .build/bundle/programs/server
 rm -rf node_modules
 /home/wekan/.meteor/meteor npm install
-cd /app
+cd /home/wekan/app

.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 {
   "dockerComposeFile": "docker-compose.yml",
   "service": "wekan-dev",
-  "workspaceFolder": "/app",
+  "workspaceFolder": "/home/wekan/app",
   "extensions": [
     "mutantdino.resourcemonitor",
     "editorconfig.editorconfig",

.devcontainer/docker-compose.yml

@@ -21,8 +21,8 @@ services:
     networks:
       - wekan-dev-tier
     build:
-      context: .
+      context: ..
-      dockerfile: Dockerfile
+      dockerfile: .devcontainer/Dockerfile
     ports:
       - 3000:3000
       - 9229:9229
@@ -38,7 +38,7 @@ services:
     depends_on:
       - wekandb-dev
     volumes:
-      - ..:/app
+      - ..:/app:delegated
     command:
       sleep infinity
 

.vscode/launch.json

@@ -0,0 +1,28 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+      {
+          "type": "chrome",
+          "request": "launch",
+          "name": "Meteor: Chrome",
+          "url": "http://localhost:3000",
+          "webRoot": "${workspaceFolder}"
+      },
+      {
+          "type": "node",
+          "request": "launch",
+          "name": "Meteor: Node",
+          "runtimeExecutable": "/home/wekan/.meteor/meteor",
+          "runtimeArgs": ["run", "--inspect-brk=9229"],
+          "outputCapture": "std",
+          "port": 9229,
+          "timeout": 60000
+      }
+  ],
+  "compounds": [
+      {
+          "name": "Meteor: All",
+          "configurations": ["Meteor: Node", "Meteor: Chrome"]
+      }
+  ]
+}