summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.devcontainer/Dockerfile4
-rw-r--r--.devcontainer/devcontainer.json2
-rw-r--r--.gitignore1
3 files changed, 4 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": [
diff --git a/.gitignore b/.gitignore
index 38f8ecfe..519d5d97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ ehthumbs.db
.eslintcache
.meteor/local
.meteor-1.6-snap/.meteor/local
+.devcontainer/docker-compose.extend.yml