[SPARK-20781] the location of Dockerfile in docker.properties.templat is wrong

liu-zhaokun · srowen · commit 3aad5982a80c · 2017-05-19T20:47:37.000+01:00
[https://issues.apache.org/jira/browse/SPARK-20781](https://issues.apache.org/jira/browse/SPARK-20781) the location of Dockerfile in docker.properties.template should be "../external/docker/spark-mesos/Dockerfile" Author: liuzhaokun <liu.zhaokun@zte.com.cn> Closes #18013 from liu-zhaokun/dockerfile_location. (cherry picked from commit 749418d) Signed-off-by: Sean Owen <sowen@cloudera.com>
diff --git a/conf/docker.properties.template b/conf/docker.properties.template
@@ -15,6 +15,6 @@
 # limitations under the License.
 #
 
-spark.mesos.executor.docker.image: <image built from `../docker/spark-mesos/Dockerfile`>
+spark.mesos.executor.docker.image: <image built from `../external/docker/spark-mesos/Dockerfile`>
 spark.mesos.executor.docker.volumes: /usr/local/lib:/host/usr/local/lib:ro
 spark.mesos.executor.home: /opt/spark

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@`
`15`	`15`	`# limitations under the License.`
`16`	`16`	`#`
`17`	`17`
`18`		-spark.mesos.executor.docker.image: <image built from `../docker/spark-mesos/Dockerfile`>
	`18`	+spark.mesos.executor.docker.image: <image built from `../external/docker/spark-mesos/Dockerfile`>
`19`	`19`	`spark.mesos.executor.docker.volumes: /usr/local/lib:/host/usr/local/lib:ro`
`20`	`20`	`spark.mesos.executor.home: /opt/spark`