From 7a97916b1f0fa46de687c75ff90a662e74be3872 Mon Sep 17 00:00:00 2001
From: Elisey Zanko <elisey.zanko@gmail.com>
Date: Fri, 6 May 2016 01:35:48 +0500
Subject: [PATCH] Bump Storm version

---
 storm/content.md         | 18 +++++++++---------
 storm/docker-compose.yml |  8 ++++----
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/storm/content.md b/storm/content.md
index 9f9a10077..c3f5159dc 100644
--- a/storm/content.md
+++ b/storm/content.md
@@ -12,9 +12,9 @@ This image entry point is a [Storm command line client](http://storm.apache.org/
 
 ## Running topologies in local mode
 
-Assuming you have `storm-starter-topologies-1.0.0.jar` in the current directory.
+Assuming you have `storm-starter-topologies-1.0.1.jar` in the current directory.
 
-	$ docker run -it -v $(pwd)/storm-starter-topologies-1.0.0.jar:/topology.jar 31z4/storm:1.0.0 jar /topology.jar org.apache.storm.starter.ExclamationTopology
+	$ docker run -it -v $(pwd)/storm-starter-topologies-1.0.1.jar:/topology.jar 31z4/storm:1.0.1 storm jar /topology.jar org.apache.storm.starter.ExclamationTopology
 
 ## Setting up a minimal Storm cluster
 
@@ -24,15 +24,15 @@ Assuming you have `storm-starter-topologies-1.0.0.jar` in the current directory.
 
 2.	The Nimbus daemon has to be connected with the Zookeeper. It's also a "fail fast" system.
 
-		$ docker run -d --restart always --name nimbus --net container:zookeeper 31z4/storm:1.0.0 nimbus
+		$ docker run -d --restart always --name nimbus --net container:zookeeper 31z4/storm:1.0.1 storm nimbus
 
 3.	Finally start a single Supervisor node. It will talk to the Nimbus and Zookeeper.
 
-		$ docker run -d --restart always --name supervisor --net container:nimbus --net container:zookeeper 31z4/storm:1.0.0 supervisor
+		$ docker run -d --restart always --name supervisor --net container:nimbus --net container:zookeeper 31z4/storm:1.0.1 storm supervisor
 
 4.	Now we can submit a topology to our cluster.
 
-		$ docker run -it --net container:nimbus -v $(pwd)/storm-starter-topologies-1.0.0.jar:/topology.jar 31z4/storm:1.0.0 jar /topology.jar org.apache.storm.starter.WordCountTopology topology
+		$ docker run -it --net container:nimbus -v $(pwd)/storm-starter-topologies-1.0.1.jar:/topology.jar 31z4/storm:1.0.1 storm jar /topology.jar org.apache.storm.starter.WordCountTopology topology
 
 ## %%COMPOSE%%
 
@@ -40,20 +40,20 @@ Run `docker-compose up` and wait for it to initialize completely. The Nimbus wil
 
 ## Configuration
 
-This image uses [default configuration](https://github.com/apache/storm/blob/v1.0.0/conf/defaults.yaml) of the Apache Storm. There are two main ways to change it.
+This image uses [default configuration](https://github.com/apache/storm/blob/v1.0.1/conf/defaults.yaml) of the Apache Storm. There are two main ways to change it.
 
 1.	Using command line arguments.
 
-		$ docker run -d --restart always --name nimbus 31z4/storm:1.0.0 nimbus -c storm.log.dir="/logs" -c storm.zookeeper.servers="[\"zookeeper\"]"
+		$ docker run -d --restart always --name nimbus 31z4/storm:1.0.1 storm nimbus -c storm.log.dir="/logs" -c storm.zookeeper.servers="[\"zookeeper\"]"
 
 2.	Assuming you have `storm.yaml` in the current directory you can mount it as a volume.
 
-		$ docker run -it -v $(pwd)/storm.yaml:/apache-storm-1.0.0/conf/storm.yaml 31z4/storm:1.0.0 nimbus
+		$ docker run -it -v $(pwd)/storm.yaml:/apache-storm-1.0.1/conf/storm.yaml 31z4/storm:1.0.1 storm nimbus
 
 ## Data persistence
 
 No data are persisted by default. For convenience there are `/data` and `/logs` directories in the image owned by `storm` user. Use them accordingly to persist data and logs using volumes.
 
-	$ docker run -it -v /logs -v /data 31z4/storm:1.0.0 nimbus -c storm.log.dir="/logs" -c storm.local.dir="/data"
+	$ docker run -it -v /logs -v /data 31z4/storm:1.0.1 storm nimbus -c storm.log.dir="/logs" -c storm.local.dir="/data"
 
 *Please be noticed that using paths other than those predefined is likely to cause permission denied errors. It's because for [security reasons](https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#user) the Storm is running under the non-root `storm` user.*
diff --git a/storm/docker-compose.yml b/storm/docker-compose.yml
index 01ff8f00e..b75fc1036 100644
--- a/storm/docker-compose.yml
+++ b/storm/docker-compose.yml
@@ -5,8 +5,8 @@ services:
         restart: always
 
     nimbus:
-        image: 31z4/storm:1.0.0
-        command: nimbus -c storm.zookeeper.servers="[\"zookeeper\"]" -c nimbus.host="nimbus"
+        image: 31z4/storm:1.0.1
+        command: storm nimbus -c storm.zookeeper.servers="[\"zookeeper\"]" -c nimbus.host="nimbus"
         depends_on:
             - zookeeper
         restart: always
@@ -14,8 +14,8 @@ services:
             - 6627:6627
 
     supervisor:
-        image: 31z4/storm:1.0.0
-        command: supervisor -c storm.zookeeper.servers="[\"zookeeper\"]" -c nimbus.host="nimbus"
+        image: 31z4/storm:1.0.1
+        command: storm supervisor -c storm.zookeeper.servers="[\"zookeeper\"]" -c nimbus.host="nimbus"
         depends_on:
             - nimbus
         restart: always