Merge pull request apache#8 from mesosphere/revert-4-sur-history-server

Revert "introduction of runit, nginx, spark"

Author: Sergiusz Urbaniak

bin/make-docker.sh

@@ -4,10 +4,9 @@
 # ./bin/make-docker.sh <spark-dist-dir> <image>
 
 rm -rf build/docker
-mkdir -p build/docker/dist
-cp -r "$1/." build/docker/dist
-cp -r conf/* build/docker/dist/conf
-cp -r docker/* build/docker
+mkdir -p build/docker
+cp -r "$1/." build/docker
+cp docker/* build/docker
 
 pushd build/docker
 docker build -t $2 .

conf/log4j.properties renamed to conf/log4j-dispatcher.properties

@@ -1,5 +1,5 @@
 # Set everything to be logged to the console
-log4j.rootCategory=INFO, console
+log4j.rootCategory=TRACE, console
 log4j.appender.console=org.apache.log4j.ConsoleAppender
 log4j.appender.console.target=System.err
 log4j.appender.console.layout=org.apache.log4j.PatternLayout
@@ -10,4 +10,3 @@ log4j.logger.org.eclipse.jetty=WARN
 log4j.logger.org.eclipse.jetty.util.component.AbstractLifeCycle=ERROR
 log4j.logger.org.apache.spark.repl.SparkIMain$exprTyper=INFO
 log4j.logger.org.apache.spark.repl.SparkILoop$SparkILoopInterpreter=INFO
-

docker/Dockerfile

@@ -27,7 +27,7 @@ ENV DEBCONF_NONINTERACTIVE_SEEN "true"
 
 # Upgrade package index and install basic commands.
 RUN apt-get update && \
-    apt-get install -y software-properties-common runit nginx
+    apt-get install -y software-properties-common
 RUN add-apt-repository ppa:openjdk-r/ppa
 RUN apt-get update && \
     apt-get install -y openjdk-8-jdk curl
@@ -38,12 +38,11 @@ ENV HADOOP_CONF_DIR /etc/hadoop
 
 RUN mkdir /etc/hadoop
 
-ADD dist /opt/spark/dist
-ADD hadoop/* /etc/hadoop/
-ADD runit/service /var/lib/runit/service
-ADD runit/init.sh /sbin/init.sh
-ADD nginx /etc/nginx
-ADD html /usr/html
+ADD . /opt/spark/dist
+
+ADD hdfs-site.xml /etc/hadoop/hdfs-site.xml
+ADD core-site.xml /etc/hadoop/core-site.xml
+ADD mesos-site.xml /etc/hadoop/mesos-site.xml
 
 #RUN ln -sf /usr/lib/libmesos.so /usr/lib/libmesos-0.23.1.so
 
@@ -54,8 +53,4 @@ RUN ln -s /bin/bash /usr/bin/bash
 RUN ln -s /bin/ls /usr/bin/ls
 RUN ln -s /bin/grep /usr/bin/grep
 
-RUN ln -s /var/lib/runit/service/spark /etc/service/spark
-RUN ln -s /var/lib/runit/service/nginx /etc/service/nginx
-
 WORKDIR /opt/spark/dist
-