Merge pull request gettyimages#3 from jhalterman/masterenv

dylanmei · dylanmei · commit ee664756afab · 2015-11-14T12:10:50.000-08:00
Set master node as an environment variable
diff --git a/README.md b/README.md
@@ -12,12 +12,12 @@ To create a standalone cluster with [docker-compose](http://docs.docker.com/comp
 The SparkUI will be running at `http://${YOUR_DOCKER_HOST}:8080` with one worker listed. To run `spark-shell`, exec into a container:
 
     docker exec -it dockerspark_master_1 /bin/bash
-    /usr/spark/bin/spark-shell --master spark://master:7077
+    /usr/spark/bin/spark-shell
 
 To run `SparkPi`, exec into a container:
 
     docker exec -it dockerspark_master_1 /bin/bash
-    MASTER=spark://master:7077 /usr/spark/bin/run-example SparkPi 10
+    /usr/spark/bin/run-example SparkPi 10
 
 ## license
 
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -4,6 +4,7 @@ master:
   hostname: master
   environment:
     SPARK_CONF_DIR: /conf
+    MASTER: spark://master:7077
   expose:
     - 7001
     - 7002
