CHUKWA-808. Fix solr startup for Docker support. (Eric Yang)
diff --git a/CHANGES.txt b/CHANGES.txt
index bb57155..44a5350 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -22,6 +22,8 @@
BUGS
+ CHUKWA-808. Fix solr startup for Docker support. (Eric Yang)
+
CHUKWA-807. Update Docker support to current. (Eric Yang)
CHUKWA-803. Update Solr API to version 5 API. (Eric Yang)
diff --git a/contrib/docker/start-all.sh b/contrib/docker/start-all.sh
index 17701f5..7f0fd7b 100755
--- a/contrib/docker/start-all.sh
+++ b/contrib/docker/start-all.sh
@@ -21,8 +21,8 @@
export CHUKWA_CONF_DIR=/opt/apache/chukwa/etc/chukwa
service sshd start
su - zookeeper -c '/opt/apache/zookeeper/bin/zkServer.sh start'
-su - solr -c 'cd /opt/apache/solr; ./bin/solr start -cloud -z localhost:2181 >/dev/null 2>&1 &'
-su - solr -c 'cd /opt/apache/solr; ./bin/solr create_collection -c chukwa -n chukwa >/dev/null 2>&1 &'
+su - solr -c 'cd /opt/apache/solr; ./bin/solr start -cloud -z localhost:2181'
+su - solr -c 'cd /opt/apache/solr; ./bin/solr create_collection -c chukwa -n chukwa'
su - hdfs -c '/opt/apache/hadoop/sbin/start-dfs.sh >/dev/null 2>&1'
su - yarn -c '/opt/apache/hadoop/sbin/start-yarn.sh >/dev/null 2>&1'
SAFE_MODE=`su - hdfs -c '/opt/apache/hadoop/bin/hadoop dfsadmin -safemode get 2>/dev/null'`
