From dbdb26a0444598cb6757cfb41f2abf74a89ed124 Mon Sep 17 00:00:00 2001
From: Christoph Jahn <cj@road42.de>
Date: Wed, 28 Aug 2019 15:26:17 +0200
Subject: Fixed endless compilation devcontainer, debugging

---
 .devcontainer/Dockerfile         | 15 ++++++++++++++-
 .devcontainer/build.sh           |  4 ++--
 .devcontainer/devcontainer.json  |  2 +-
 .devcontainer/docker-compose.yml |  6 +++---
 4 files changed, 20 insertions(+), 7 deletions(-)

(limited to '.devcontainer')

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 06f5155b..f9b01d8f 100644
--- a/.devcontainer/Dockerfile
+++ b/.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
diff --git a/.devcontainer/build.sh b/.devcontainer/build.sh
index e9de3e8f..e5343cab 100644
--- a/.devcontainer/build.sh
+++ b/.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
\ No newline at end of file
+cd /home/wekan/app
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 6a1faa65..f4e1367b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.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",
diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 0f5f272b..7a5f8e10 100644
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -21,8 +21,8 @@ services:
     networks:
       - wekan-dev-tier
     build:
-      context: .
-      dockerfile: Dockerfile
+      context: ..
+      dockerfile: .devcontainer/Dockerfile
     ports:
       - 3000:3000
       - 9229:9229
@@ -38,7 +38,7 @@ services:
     depends_on:
       - wekandb-dev
     volumes:
-      - ..:/app
+      - ..:/app:delegated
     command:
       sleep infinity
 
-- 
cgit v1.2.3-1-g7c22