update entrypoint

iamghost007 · Aug 26, 2016 · fe86963 · fe86963
1 parent 0b4863b
commit fe86963
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/docker/bark-base/Dockerfile b/docker/bark-base/Dockerfile
@@ -24,6 +24,7 @@ RUN rm /usr/local/hadoop-2.6.0/share/hadoop/yarn/lib/jline-0.9.94.jar
 RUN cd /apache && wget https://www.apache.org/dist/tomcat/tomcat-7/v7.0.70/bin/apache-tomcat-7.0.70.tar.gz && tar -xvf apache-tomcat-7.0.70.tar.gz
 ADD config/tomcat /etc/init.d/
 RUN chmod 775 /etc/init.d/tomcat
+ENV TOMCAT_HOME /apache/apache-tomcat-7.0.70
 
 #install mongodb
 ADD config/mongodb-org-3.2.repo /etc/yum.repos.d/

diff --git a/docker/bark/start-up.sh b/docker/bark/start-up.sh
@@ -21,18 +21,10 @@ $HADOOP_PREFIX/sbin/start-yarn.sh
 #spark start
 $SPARK_HOME/sbin/start-all.sh
 
-#start tomcat service
-/etc/init.d/tomcat start
+#start mongodb
 mongod -f /etc/mongod.conf
 #start script
 nohup ./bark_regular_run.sh &
 
-
-CMD=${1:-"exit 0"}
-if [[ "$CMD" == "-d" ]];
-then
-	service sshd stop
-	/usr/sbin/sshd -D -d
-else
-	/bin/bash -c "$*"
-fi
+#start tomcat
+$TOMCAT_HOME/bin/catalina.sh run