Merge branch 'master' into add-accounting

inflector · Dec 5, 2017 · bbde464 · bbde464
2 parents c2229de + d926ec9
commit bbde464
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/dao/Dockerfile b/dao/Dockerfile
@@ -1,9 +1,12 @@
-FROM node:latest
+FROM node:8
 
 WORKDIR /dao
-RUN npm install -g truffle
 
-ADD . /dao
+COPY package.json .
+
+RUN \
+    npm install -g truffle && \
+    npm install
+
+COPY . .
 
-RUN npm install
-RUN npm install zeppelin-solidity
diff --git a/dao/dao.sh b/dao/dao.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env sh
 
 set -o errexit
+set -o verbose
+set -o xtrace
 set -o nounset
 
 
@@ -14,7 +16,8 @@ bash)
     ;;
 
 run)
-    truffle compile-all
+    cd /dao
+    truffle compile
     truffle migrate --reset
     truffle test
     ;;

diff --git a/dao/package.json b/dao/package.json
@@ -15,6 +15,6 @@
     "ganache-cli": "^6.0.3",
     "scrypt": "^6.0.3",
     "truffle-hdwallet-provider": "0.0.3",
-    "zeppelin-solidity": "^1.3.0"
+    "zeppelin-solidity": "^1.4.0"
   }
 }
diff --git a/docker-compose.dao.yml b/docker-compose.dao.yml
@@ -6,7 +6,7 @@ services:
     dao:
       build: dao
       volumes:
-        - ./dao:/dao
+        - ./data/dao:/data
       links:
         - testrpc
 

diff --git a/testrpc/Dockerfile b/testrpc/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:6
+FROM node:8
 
 WORKDIR /code