diff options
| author | Christoph Jahn <cj@road42.de> | 2019-09-03 21:20:24 +0200 |
|---|---|---|
| committer | Christoph Jahn <cj@road42.de> | 2019-09-03 21:20:24 +0200 |
| commit | a715e30cbae105c512ec27ce26c63c5228edc1b7 (patch) | |
| tree | ab01bbfeada4f883662091ff83ab17c6493cdaa9 /.devcontainer | |
| parent | 8633bd897413137622a4bb93bb0edfe8d1797cb8 (diff) | |
| download | wekan-a715e30cbae105c512ec27ce26c63c5228edc1b7.tar.gz wekan-a715e30cbae105c512ec27ce26c63c5228edc1b7.tar.bz2 wekan-a715e30cbae105c512ec27ce26c63c5228edc1b7.zip | |
DevContainer: use docker extend file, fix PATH
Diffstat (limited to '.devcontainer')
| -rw-r--r-- | .devcontainer/Dockerfile | 4 | ||||
| -rw-r--r-- | .devcontainer/devcontainer.json | 2 |
2 files changed, 3 insertions, 3 deletions
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": [ |