Merge pull request #2672 from Scherdel/master

Devcontainer: Removed MAIL-Vars, Add PATH with meteor to Envionment

.devcontainer/Dockerfile

@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 ENV \
     DEBUG=false \
-    NODE_VERSION=8.16.0 \
+    NODE_VERSION=8.16.1 \
     METEOR_RELEASE=1.8.1 \
     USE_EDGE=false \
     METEOR_EDGE=1.5-beta.17 \
@@ -144,11 +144,13 @@ RUN set -o xtrace \
   && printf "\n[-] Installing Meteor $METEOR_VERSION...\n\n" \
   && sh /home/wekan/install-meteor.sh
 
-ENV PATH=$PATH:$HOME/.meteor/
+ENV PATH=$PATH:/home/wekan/.meteor/
 
 # Copy source dir
 USER root
 
+RUN echo "export PATH=$PATH" >> /etc/environment
+
 RUN set -o xtrace \
   && mkdir /home/wekan/app
 

.devcontainer/devcontainer.json

@@ -1,6 +1,6 @@
 // See https://aka.ms/vscode-remote/devcontainer.json for format details.
 {
-  "dockerComposeFile": "docker-compose.yml",
+  "dockerComposeFile": ["docker-compose.yml", "docker-compose.extend.yml"],
   "service": "wekan-dev",
   "workspaceFolder": "/home/wekan/app",
   "extensions": [

.devcontainer/docker-compose.yml

@@ -3,7 +3,7 @@ version: '3.7'
 services:
 
   wekandb-dev:
-    image: mongo:4.0.11
+    image: mongo:4.0.12
     container_name: wekan-dev-db
     restart: unless-stopped
     command: mongod --smallfiles --oplogSize 128
@@ -29,9 +29,6 @@ services:
     environment:
       - MONGO_URL=mongodb://wekandb-dev:27017/wekan
       - ROOT_URL=http://localhost:3000
-      #- MAIL_URL=smtp://user:pass@mailserver.example.com:25/
-      - MAIL_URL=smtp://<mail_url>:25/?ignoreTLS=true&tls={rejectUnauthorized:false}
-      - MAIL_FROM=Wekan Notifications <noreply.wekan@mydomain.com>
       - WITH_API=true
       - RICHER_CARD_COMMENT_EDITOR=true
       - BROWSER_POLICY_ENABLED=true

.gitignore

@@ -31,3 +31,4 @@ ehthumbs.db
 .eslintcache
 .meteor/local
 .meteor-1.6-snap/.meteor/local
+.devcontainer/docker-compose.extend.yml