From a715e30cbae105c512ec27ce26c63c5228edc1b7 Mon Sep 17 00:00:00 2001 From: Christoph Jahn Date: Tue, 3 Sep 2019 21:20:24 +0200 Subject: DevContainer: use docker extend file, fix PATH --- .devcontainer/Dockerfile | 4 ++-- .devcontainer/devcontainer.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to '.devcontainer') diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 83691cd2..ff9e6177 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -144,12 +144,12 @@ 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 echo "export PATH=$PATH" >> /etc/environment RUN set -o xtrace \ && mkdir /home/wekan/app diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index f4e1367b..432e7c19 100644 --- a/.devcontainer/devcontainer.json +++ b/.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": [ -- cgit v1.2.3-1-g7c22