Quellcode durchsuchen

DevContainer: use docker extend file, fix PATH

Christoph Jahn vor 5 Jahren
Ursprung
Commit
a715e30cba
3 geänderte Dateien mit 4 neuen und 3 gelöschten Zeilen
  1. 2 2
      .devcontainer/Dockerfile
  2. 1 1
      .devcontainer/devcontainer.json
  3. 1 0
      .gitignore

+ 2 - 2
.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

+ 1 - 1
.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": [

+ 1 - 0
.gitignore

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