Merge branch 'master' of github.com:ziyunhx/storm-mono-docker

ziyunhx · Nov 9, 2015 · 2170b07 · 2170b07
2 parents e88cfd1 + 5adfa85
commit 2170b07
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -13,15 +13,25 @@ The images are available directly from [https://index.docker.io](https://index.d
 
 Start a cluster:
 
-- ```docker-compose up```
+- ```docker-compose up -d```
+
+- The ```docker-compose up``` command aggregates the output of each container. When the command exits, all containers are stopped. Running ```docker-compose up -d``` starts the containers in the background and leaves them running.
 
 Destroy a cluster:
 
 - ```docker-compose stop```
 
 Add more supervisors:
 
-- ```docker-compose scale supervisor=3```
+- ```docker-compose scale supervisor=4```
+
+Kill and rm all docker cache:
+
+- ```docker kill $(docker ps -q) ; docker rm $(docker ps -a -q)```
+
+Remove all docker image:
+
+- ```docker rmi $(docker images -q -a)```
 
 ##Building
 

diff --git a/client.sh b/client.sh
diff --git a/storm-nimbus/Dockerfile b/storm-nimbus/Dockerfile
@@ -8,5 +8,4 @@ EXPOSE 6627
 EXPOSE 3772
 EXPOSE 3773
 ADD start-supervisor.sh /usr/bin/start-supervisor.sh
-
-CMD /usr/bin/start-supervisor.sh
+CMD /usr/bin/start-supervisor.sh
diff --git a/storm-nimbus/start-supervisor.sh b/storm-nimbus/start-supervisor.sh
@@ -4,4 +4,4 @@ sed -i -e "s/%nimbus%/$IP/g" $STORM_HOME/conf/storm.yaml
 
 echo "storm.local.hostname: `hostname -i`" >> $STORM_HOME/conf/storm.yaml
 
-/usr/sbin/sshd && supervisord
+/usr/sbin/sshd && supervisord
diff --git a/storm-supervisor/Dockerfile b/storm-supervisor/Dockerfile
@@ -14,4 +14,4 @@ EXPOSE 8000
 
 RUN /usr/bin/config-supervisord.sh supervisor
 RUN /usr/bin/config-supervisord.sh logviewer
-CMD /usr/bin/start-supervisor.sh
+CMD /usr/bin/start-supervisor.sh
diff --git a/storm-ui/Dockerfile b/storm-ui/Dockerfile
@@ -4,4 +4,4 @@ MAINTAINER Carey Tzou <carey@tnidea.com>
 RUN /usr/bin/config-supervisord.sh ui
 
 EXPOSE 8080
-CMD /usr/bin/start-supervisor.sh
+CMD /usr/bin/start-supervisor.sh
diff --git a/storm/Dockerfile b/storm/Dockerfile
@@ -13,4 +13,4 @@ ADD cluster.xml $STORM_HOME/logback/cluster.xml
 ADD config-supervisord.sh /usr/bin/config-supervisord.sh
 ADD start-supervisor.sh /usr/bin/start-supervisor.sh 
 
-RUN echo [supervisord] | tee -a /etc/supervisor/supervisord.conf ; echo nodaemon=true | tee -a /etc/supervisor/supervisord.conf
+RUN echo [supervisord] | tee -a /etc/supervisor/supervisord.conf ; echo nodaemon=true | tee -a /etc/supervisor/supervisord.conf
diff --git a/storm/config-supervisord.sh b/storm/config-supervisord.sh
@@ -2,4 +2,4 @@ echo [program:storm-$1] | tee -a /etc/supervisor/conf.d/storm-$1.conf
 echo command=storm $1 | tee -a /etc/supervisor/conf.d/storm-$1.conf
 echo directory=/home/storm | tee -a /etc/supervisor/conf.d/storm-$1.conf
 echo autorestart=true | tee -a /etc/supervisor/conf.d/storm-$1.conf
-echo user=root | tee -a /etc/supervisor/conf.d/storm-$1.conf
+echo user=root | tee -a /etc/supervisor/conf.d/storm-$1.conf
diff --git a/storm/start-supervisor.sh b/storm/start-supervisor.sh
@@ -3,4 +3,4 @@ sed -i -e "s/%nimbus%/$NIMBUS_PORT_6627_TCP_ADDR/g" $STORM_HOME/conf/storm.yaml
 
 echo "storm.local.hostname: `hostname -i`" >> $STORM_HOME/conf/storm.yaml
 
-/usr/sbin/sshd && supervisord
+/usr/sbin/sshd && supervisord
diff --git a/storm/storm.yaml b/storm/storm.yaml
@@ -4,4 +4,4 @@ nimbus.host: "%nimbus%"
 drpc.servers:
   - "%nimbus%"
 drpc.port: 3772
-drpc.invocations.port: 3773
+drpc.invocations.port: 3773