updated to storm 0.9.3-rc1

* jdk7

client.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+docker run -i -t --link stormdocker_nimbus_1:nimbus -p 22 wurstmeister/storm /bin/bash

fig.yml

@@ -1,26 +1,30 @@
 zookeeper:
- image: jplock/zookeeper
+ image: wurstmeister/zookeeper
  ports: 
  - "49181:2181"
+ - "22"
 nimbus:
- image: wurstmeister/storm-nimbus:0.9.2
+ image: wurstmeister/storm-nimbus
  ports:
  - "49773:3773"
  - "49772:3772"
  - "49627:6627"
+ - "22"
  links: 
  - zookeeper:zk
 supervisor:
- image: wurstmeister/storm-supervisor:0.9.2
+ image: wurstmeister/storm-supervisor
  ports:
  - "8000"
+ - "22"
  links: 
  - nimbus:nimbus
  - zookeeper:zk
 ui:
- image: wurstmeister/storm-ui:0.9.2
+ image: wurstmeister/storm-ui
  ports:
  - "49080:8080"
+ - "22"
  links: 
  - nimbus:nimbus
- - zookeeper:zk
+ - zookeeper:zk

storm-nimbus/Dockerfile

@@ -1,4 +1,4 @@
-FROM wurstmeister/storm:0.9.2
+FROM wurstmeister/storm
 MAINTAINER Wurstmeister
 
 RUN /usr/bin/config-supervisord.sh nimbus 

storm-nimbus/start-supervisor.sh

@@ -2,4 +2,6 @@ export IP=`hostname -i`
 sed -i -e "s/%zookeeper%/$ZK_PORT_2181_TCP_ADDR/g" $STORM_HOME/conf/storm.yaml
 sed -i -e "s/%nimbus%/$IP/g" $STORM_HOME/conf/storm.yaml
 
-supervisord
+echo "storm.local.hostname: `hostname -i`" >> $STORM_HOME/conf/storm.yaml
+
+/usr/sbin/sshd && supervisord

storm-supervisor/Dockerfile

@@ -1,4 +1,4 @@
-FROM wurstmeister/storm:0.9.2
+FROM wurstmeister/storm
 MAINTAINER Wurstmeister
 
 EXPOSE 6700

storm-ui/Dockerfile

@@ -1,4 +1,4 @@
-FROM wurstmeister/storm:0.9.2
+FROM wurstmeister/storm
 MAINTAINER Wurstmeister
 RUN /usr/bin/config-supervisord.sh ui
 

storm/Dockerfile

@@ -1,17 +1,16 @@
-FROM ubuntu
+FROM wurstmeister/base
 
 MAINTAINER Wurstmeister 
 
-RUN echo "deb http:https://archive.ubuntu.com/ubuntu precise universe" >> /etc/apt/sources.list; apt-get update; apt-get install -y unzip openjdk-6-jdk wget supervisor
-RUN wget -q -N http:https://mirror.ox.ac.uk/sites/rsync.apache.org/incubator/storm/apache-storm-0.9.2-incubating/apache-storm-0.9.2-incubating.zip; unzip -o /apache-storm-0.9.2-incubating.zip -d /usr/share/; rm apache-storm-0.9.2-incubating.zip
-ENV STORM_HOME /usr/share/apache-storm-0.9.2-incubating
-ENV JAVA_HOME /usr/lib/jvm/java-6-openjdk-amd64/
+RUN wget -q -O - http:https://people.apache.org/~ptgoetz/apache-storm-0.9.3-rc1/apache-storm-0.9.3-rc1.tar.gz | tar -xzf - -C /opt
+ENV STORM_HOME /opt/apache-storm-0.9.3-rc1
 RUN groupadd storm; useradd --gid storm --home-dir /home/storm --create-home --shell /bin/bash storm; chown -R storm:storm $STORM_HOME; mkdir /var/log/storm ; chown -R storm:storm /var/log/storm
-RUN ln -s $STORM_HOME/bin/storm /usr/bin/storm 
+
+RUN ln -s $STORM_HOME/bin/storm /usr/bin/storm
 
 ADD storm.yaml $STORM_HOME/conf/storm.yaml
 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

storm/cluster.xml

@@ -62,7 +62,7 @@
  </logger>
 
  <logger name="backtype.storm">
- <level value="DEBUG" />
+ <level value="INFO" />
  <appender-ref ref="A1" />
  </logger>
 

storm/start-supervisor.sh

@@ -1,4 +1,6 @@
 sed -i -e "s/%zookeeper%/$ZK_PORT_2181_TCP_ADDR/g" $STORM_HOME/conf/storm.yaml
 sed -i -e "s/%nimbus%/$NIMBUS_PORT_6627_TCP_ADDR/g" $STORM_HOME/conf/storm.yaml
 
-supervisord
+echo "storm.local.hostname: `hostname -i`" >> $STORM_HOME/conf/storm.yaml
+
+/usr/sbin/sshd && supervisord

storm/storm.yaml

@@ -1,16 +1,6 @@
-
 storm.zookeeper.servers:
  - "%zookeeper%"
-
 nimbus.host: "%nimbus%"
-
-# netty transport
-storm.messaging.transport: "backtype.storm.messaging.netty.Context"
-storm.messaging.netty.buffer_size: 16384
-storm.messaging.netty.max_retries: 10
-storm.messaging.netty.min_wait_ms: 1000
-storm.messaging.netty.max_wait_ms: 5000
-
 drpc.servers:
  - "%nimbus%"
 drpc.port: 3772