Integrade dapp and properly set up node modules

.gitignore

@@ -1,2 +1,3 @@
+/dapp/
 /bridge/
 /js/

container/Dockerfile

@@ -75,13 +75,27 @@ RUN ../bridge-server-venv/bin/pip3.6 install kombu==4.1
 # https://github.com/OriginProtocol/bridge-server/issues/74
 RUN sed -i '24s/.*/    return True\n    """/' /opt/bridge-server/bridge-server-venv/lib/python3.6/site-packages/ipfsapi/client.py
 
-# install node modules
-WORKDIR /opt/js
-RUN git clone https://github.com/OriginProtocol/origin-js.git source
-WORKDIR /opt/js/source
+# js - install node modules
+RUN mkdir /opt/origin-js
+WORKDIR /opt/origin-js
+RUN git clone https://github.com/OriginProtocol/origin-js.git temp-source
+WORKDIR /opt/origin-js/temp-source
 RUN git checkout develop
-ENV NODE_PATH=/opt/js/node_modules
 RUN npm run install:dev
+RUN cp -r node_modules /opt/origin-js/node_modules
+
+# dapp - install node modules
+RUN mkdir /opt/origin-dapp
+WORKDIR /opt/origin-dapp
+RUN git clone https://github.com/OriginProtocol/demo-dapp.git temp-source
+WORKDIR /opt/origin-dapp/temp-source
+RUN git checkout develop
+RUN npm run install:dev
+RUN mv node_modules /opt/origin-dapp/node_modules
+
+# Copy start scripts for js and dapp
+COPY files/scripts/start-js.sh /opt/origin-js/scripts/start-js.sh
+COPY files/scripts/start-dapp.sh /opt/origin-dapp/scripts/start-dapp.sh
 
 # Elasticsearch 5.4.3 (minimum across regions, of the highest version in a region)
 WORKDIR /tmp
@@ -114,8 +128,4 @@ RUN apt-get install -y sudo
 # cleanup
 RUN rm -rf /tmp/*
 
-# Expose ports for pm2 health check endpoint, bridge server, ipfs, postgres, redis, ganache, elasticsearch
-# TODO: pull these from configs
-EXPOSE 4000 5000 5002 8080 8081 5432 6379 8545 9200
-
 CMD pm2-runtime /opt/process.json --web 4000

container/files/process.json

@@ -32,12 +32,14 @@
     "cwd"        : "/opt/es",
     "interpreter": "/bin/bash"
   },{
-    "name": "origin-js",
-    "script": "npm",
-    "args": "start",
-    "cwd": "/opt/origin-js/source",
-    "env": {
-      "NODE_PATH": "/opt/js/node_modules"
-    }
+    "name"       : "origin-js",
+    "script"     : "start-js.sh",
+    "cwd"        : "/opt/origin-js/scripts",
+    "interpreter": "/bin/bash"
+  },{
+    "name"       : "origin-dapp",
+    "script"     : "start-dapp.sh",
+    "cwd"        : "/opt/origin-dapp/scripts",
+    "interpreter": "/bin/bash"
   }]
 }

container/files/scripts/start-dapp.sh

@@ -0,0 +1,8 @@
+cd /opt/origin-dapp/source
+
+# update symlink to origin
+rm /usr/lib/node_modules/origin
+ln -s /opt/origin-js/source /usr/lib/node_modules/origin
+
+cp -r /opt/origin-dapp/node_modules node_modules
+npm start

container/files/scripts/start-js.sh

@@ -0,0 +1,3 @@
+cd /opt/origin-js/source
+cp -r /opt/origin-js/node_modules node_modules
+npm start

docker-compose.yml

@@ -7,12 +7,15 @@ services:
     volumes:
       - ./bridge:/opt/bridge-server/source
       - ./js:/opt/origin-js/source
+      - ./dapp:/opt/origin-dapp/source
     ports:
+      - "3000:3000"
       - "4000:4000"
       - "5000:5000"
+      - "5002:5002"
       - "5432:5432"
       - "6379:6379"
-      - "9200:9200"
-      - "5002:5002"
       - "8080:8080"
+      - "8081:8081"
       - "8545:8545"
+      - "9200:9200"

scripts/setup.sh

@@ -14,6 +14,14 @@ cd js
 git checkout develop
 cd ..
 
+# Clone dapp source
+git clone https://github.com/OriginProtocol/demo-dapp.git dapp
+
+# Checkout dapp develop branch
+cd dapp
+git checkout develop
+cd ..
+
 # Copy .env file to source
 cp ./container/files/config/bridge_server_dev.env ./bridge/.env