Merge pull request #520 from AugurProject/micah

Cleanup of docker-compose file for quick local environment setup.

Author: Micah Zoltu

.travis.yml

@@ -43,6 +43,7 @@ jobs:
                 docker pull $IMAGE_BUILD;
                 docker tag $IMAGE_BUILD $IMAGE_LATEST;
                 ARTIFACTS=true npm run docker:run:deploy && docker push $IMAGE_LATEST
+      if: type = push
 stages:
   - build
   - test

README.md

@@ -4,6 +4,17 @@
 
 Smart contracts for [Augur](https://augur.net), a decentralized prediction market platform on the [Ethereum](https://ethereum.org) blockchain.
 
+## Quick Setup
+
+If you just want to clone the repo and quickly have a couple local proof of authority networks (Geth/Clique and Parity/Aura) running with the contracts deployed then you can just clone the repo and run:
+```
+docker-compose -f support/test/integration/docker-compose.yml up --build --force-recreate
+```
+* Parity HTTP RPC will be available on localhost port `47622`.
+* Geth HTTP RPC will be available on localhost port `47624`.
+* An abundant supply of ETH is available using the private key `0xfae42052f82bed612a724fec3632f325f377120592c75bb78adfcceae6470c5a`.
+* The log output will let you know what the address of the various Augur contracts are.
+
 ## Installation
 
 You need system-wide installations of Python 2.7.6+, Node.js 8+, and [Solidity 0.4.18](https://github.com/ethereum/solidity/releases/tag/v0.4.18).  (Or Docker; see below.)  Install the dependencies:

support/test/integration/docker-compose.yml

@@ -2,18 +2,13 @@ version: "3.2"
 services:
   parity-dev-node:
     image: augurproject/dev-node-parity:latest
-    # uncomment following line to run with fixed block times instead of instant seal (parameter is seconds between blocks)
-    command: [ "1" ]
     ports:
       - "47622:8545"
       - "47621:8180"
   parity-integration-tests:
-    image: augurproject/augur-core:latest
     build:
       context: ../../../
       dockerfile: support/Dockerfile
-      cache_from:
-        - augurproject/augur-core:latest
     entrypoint: [ "npm", "run", "test:integration" ]
     # uncomment the following 3 lines to enable debugging the tests
     # command: [ "--", "--debug=0.0.0.0:9229", "--inspect-brk" ]
@@ -32,15 +27,12 @@ services:
     ports:
       - "47624:8545"
   geth-integration-tests:
-    image: augurproject/augur-core:latest
     build:
       context: ../../../
       dockerfile: support/Dockerfile
-      cache_from:
-        - augurproject/augur-core:latest
     entrypoint: [ "npm", "run", "test:integration" ]
     # uncomment the following 3 lines to enable debugging the tests
-    command: [ "--", "--debug=0.0.0.0:9229", "--inspect-brk" ]
+    # command: [ "--", "--debug=0.0.0.0:9229", "--inspect-brk" ]
     # ports:
     #   - "9229:9229"
     environment: