Merge pull request #14 from christroutner/unstable

Consistent IPFS and Tor IDs

README.md

@@ -79,9 +79,6 @@ Digital Ocean's cloud servers, but should work for any Ubuntnu system.
 to the [production/common.js file](production/common.js). This
 should be the same address associated with your memo.cash profile.
 
-- Customize the [docker-compose.yml](docker-compose.yml) file to reflect the
-location where volume data should live on the host machine.
-
 - Build the image: `docker-compose build`
 
 - Run the docker container: `docker-compose up`

docker-compose.yml

@@ -1,12 +1,9 @@
 # Start the testnet server with the command 'docker-compose up -d'
 
-#ipfs:
-#  image: ipfs/go-ipfs
-
-
 koa:
   build: ./production/
   dockerfile: Dockerfile
+  container_name: koa-ipfs
   ports:
     - "3210:3210"  # <host port>:<container port>
     - "4001:4001"  # IPFS
@@ -21,9 +18,11 @@ koa:
 
 tor:
   image: goldy/tor-hidden-service
+  container_name: tor
   links:
     - koa
   environment:
       KOA_PORTS: 80:3210 # Map port to detected service
   volumes:
     - ./keys:/var/lib/tor/hidden_service/
+  restart: always