From 125e9d2d4adeecab06145b88e419402d141b4d61 Mon Sep 17 00:00:00 2001
From: Elisey Zanko <elisey.zanko@gmail.com>
Date: Mon, 20 Feb 2017 22:47:34 +0500
Subject: [PATCH] Generalize version numbers

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

diff --git a/storm/content.md b/storm/content.md
index 560f78c4b..7d8024e9c 100644
--- a/storm/content.md
+++ b/storm/content.md
@@ -10,9 +10,9 @@ Apache Storm is a distributed computation framework written predominantly in the
 
 ## Running topologies in local mode
 
-Assuming you have `storm-starter-topologies-1.0.3.jar` in the current directory.
+Assuming you have `storm-starter-topologies-1.0.0.jar` in the current directory.
 
-	$ docker run -it -v $(pwd)/storm-starter-topologies-1.0.3.jar:/topology.jar storm:1.0.3 storm jar /topology.jar org.apache.storm.starter.ExclamationTopology
+	$ docker run -it -v $(pwd)/storm-starter-topologies-1.0.0.jar:/topology.jar storm:1.0 storm jar /topology.jar org.apache.storm.starter.ExclamationTopology
 
 ## Setting up a minimal Storm cluster
 
@@ -22,19 +22,19 @@ Assuming you have `storm-starter-topologies-1.0.3.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 some-nimbus --link some-zookeeper:zookeeper storm:1.0.3 storm nimbus
+		$ docker run -d --restart always --name some-nimbus --link some-zookeeper:zookeeper storm:1.0 storm nimbus
 
 3.	Finally start a single Supervisor node. It will talk to the Nimbus and Zookeeper.
 
-		$ docker run -d --restart always --name supervisor --link some-zookeeper:zookeeper --link some-nimbus:nimbus storm:1.0.3 storm supervisor
+		$ docker run -d --restart always --name supervisor --link some-zookeeper:zookeeper --link some-nimbus:nimbus storm:1.0 storm supervisor
 
 4.	Now you can submit a topology to our cluster.
 
-		$ docker run --link some-nimbus:nimbus -it --rm -v $(pwd)/storm-starter-topologies-1.0.3.jar:/topology.jar storm:1.0.3 storm jar /topology.jar org.apache.storm.starter.WordCountTopology topology
+		$ docker run --link some-nimbus:nimbus -it --rm -v $(pwd)/storm-starter-topologies-1.0.0.jar:/topology.jar storm:1.0 storm jar /topology.jar org.apache.storm.starter.WordCountTopology topology
 
 5.	Optionally, you can start the Storm UI.
 
-		$ docker run -d -p 8080:8080 --restart always --name ui --link some-nimbus:nimbus storm:1.0.3 storm ui
+		$ docker run -d -p 8080:8080 --restart always --name ui --link some-nimbus:nimbus storm:1.0 storm ui
 
 ## %%COMPOSE%%
 
@@ -42,24 +42,24 @@ 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.3/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.0/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 storm:1.0.3 storm nimbus -c storm.zookeeper.servers="[zookeeper]"
+		$ docker run -d --restart always --name nimbus storm:1.0 storm nimbus -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:/conf/storm.yaml storm:1.0.3 storm nimbus
+		$ docker run -it -v $(pwd)/storm.yaml:/conf/storm.yaml storm:1.0 storm nimbus
 
 ## Logging
 
-This image uses [default logging configuration](https://github.com/apache/storm/tree/v1.0.3/log4j2). All logs go to the `/logs` directory by default.
+This image uses [default logging configuration](https://github.com/apache/storm/tree/v1.0.0/log4j2). All logs go to the `/logs` directory by default.
 
 ## 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 storm:1.0.3 storm nimbus
+	$ docker run -it -v /logs -v /data storm:1.0 storm nimbus
 
 *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 064daa90b..49a6b8eae 100644
--- a/storm/docker-compose.yml
+++ b/storm/docker-compose.yml
@@ -6,7 +6,7 @@ services:
         restart: always
 
     nimbus:
-        image: storm:1.0.3
+        image: storm:1.0
         container_name: nimbus
         command: storm nimbus
         depends_on:
@@ -18,7 +18,7 @@ services:
             - 6627:6627
 
     supervisor:
-        image: storm:1.0.3
+        image: storm:1.0
         container_name: supervisor
         command: storm supervisor
         depends_on: