Merge pull request apache#19 from mesosphere/sur-dispatcher

[SPARK-213] dispatcher: serve dispatcher at /, remove html UI

Author: mgummelt

docker/Dockerfile

@@ -43,8 +43,6 @@ 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/share/nginx/html
-RUN chmod 644 /usr/share/nginx/html/*
 
 #RUN ln -sf /usr/lib/libmesos.so /usr/lib/libmesos-0.23.1.so
 

docker/html/index.html

@@ -9,9 +9,6 @@ server {
 #https#    ssl_certificate     spark.crt;
 #https#    ssl_certificate_key spark.key;
 
-    root /usr/share/nginx/html;
-    index index.html;
-
     location /v1 {
         proxy_pass <DISPATCHER_URL>;
 
@@ -26,8 +23,7 @@ server {
         proxy_read_timeout 600s;
    }
 
-   location /dispatcher/ {
-        proxy_redirect http://$host $scheme://$host/dispatcher;
+   location / {
         proxy_pass <DISPATCHER_UI_URL>/;
         proxy_set_header Host $host;
    }

docker/nginx/conf.d/spark.conf.template

@@ -17,7 +17,7 @@ fi
 
 export WEBUI_URL="${SCHEME}://${FRAMEWORK_NAME}${DNS_SUFFIX}:${SPARK_PROXY_PORT}"
 export HISTORY_SERVER_WEB_PROXY_BASE="/service/${FRAMEWORK_NAME}/history"
-export DISPATCHER_UI_WEB_PROXY_BASE="/service/${FRAMEWORK_NAME}/dispatcher"
+export DISPATCHER_UI_WEB_PROXY_BASE="/service/${FRAMEWORK_NAME}"
 
 # configure history server
 if [ "${ENABLE_HISTORY_SERVER:=false}" = "true" ]; then

docker/runit/init.sh

@@ -49,10 +49,10 @@
         {
 {{#spark.ssl.enabled}}
             "protocol": "COMMAND",
-            "command": { "value": "curl -f -k https://$HOST:$PORT3/dispatcher/" },
+            "command": { "value": "curl -f -k https://$HOST:$PORT3/" },
 {{/spark.ssl.enabled}}
 {{^spark.ssl.enabled}}
-            "path": "/dispatcher/",
+            "path": "/",
             "portIndex": 3,
             "protocol": "HTTP",
 {{/spark.ssl.enabled}}