Merge pull request #63 from HeadingMobile/dev

update composefile
rock-app · Apr 19, 2019 · 1b56d18 · 1b56d18
2 parents 3a3778e + 69cc48a
commit 1b56d18
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 167 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,5 +4,6 @@ node_modules/
 .idea/
 
 upload/
-
+docker/data/
+docker/upload/
 temp/
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -9,22 +9,24 @@ services:
     ports:
       - "27017:27017"
     networks:
-      appnet:
-        aliases:
-          - mongo
+      - appnet
 
   server:
     build:
       context: ../
       dockerfile: docker/Dockerfile
     environment:
       FABU_DB_HOST: mongo
+      FABU_BASE_URL: https://fabu.apppills.com
+      FABU_UPLOAD_DIR: /fabu/upload
     ports: 
       - "9898:9898"
+    volumes:
+      - ./upload:/fabu/upload
+    depends_on:
+      - mongo
     networks:
-      appnet:
-        aliases:
-          - fabu-server
+      - appnet
 
 networks:
   appnet:
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,5 +4,6 @@ node_modules/ @@
     .idea/
     upload/
+    docker/data/
+    docker/upload/
     temp/