Repository: zeppelin Updated Branches: refs/heads/master 321921862 -> f10b71cc1
change the spark version of dockerfile ### What is this PR for? A few sentences describing the overall goals of the pull request's commits. First time? Check out the contributing guide - https://zeppelin.apache.org/contribution/contributions.html ### What type of PR is it? [Bug Fix | Improvement | Feature | Documentation | Hot Fix | Refactoring] ### Todos * [ ] - Task ### What is the Jira issue? * Open an issue on Jira https://issues.apache.org/jira/browse/ZEPPELIN/ * Put link here, and add [ZEPPELIN-*Jira number*] in PR title, eg. [ZEPPELIN-533] ### How should this be tested? Outline the steps to test the PR here. ### Screenshots (if appropriate) ### Questions: * Does the licenses files need update? * Is there breaking changes for older versions? * Does this needs documentation? Author: sven0726 <[email protected]> Closes #2370 from sven0726/master and squashes the following commits: 15af90e [sven0726] change hadoop profile version 3b68a5f [sven0726] change the spark version of dockerfile Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/f10b71cc Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/f10b71cc Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/f10b71cc Branch: refs/heads/master Commit: f10b71cc1543f1815b5d26762fdd7ae311203eaa Parents: 3219218 Author: sven0726 <[email protected]> Authored: Mon Jun 5 16:51:36 2017 +0800 Committer: Lee moon soo <[email protected]> Committed: Wed Jun 7 10:19:51 2017 -0700 ---------------------------------------------------------------------- scripts/docker/spark-cluster-managers/spark_mesos/Dockerfile | 8 ++++---- .../spark-cluster-managers/spark_standalone/Dockerfile | 6 +++--- .../spark-cluster-managers/spark_yarn_cluster/Dockerfile | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f10b71cc/scripts/docker/spark-cluster-managers/spark_mesos/Dockerfile ---------------------------------------------------------------------- diff --git a/scripts/docker/spark-cluster-managers/spark_mesos/Dockerfile b/scripts/docker/spark-cluster-managers/spark_mesos/Dockerfile index 450afef..f47b16d 100644 --- a/scripts/docker/spark-cluster-managers/spark_mesos/Dockerfile +++ b/scripts/docker/spark-cluster-managers/spark_mesos/Dockerfile @@ -14,10 +14,10 @@ # limitations under the License. FROM centos:centos6 -ENV SPARK_PROFILE 2.0 -ENV SPARK_VERSION 2.0.0 -ENV HADOOP_PROFILE 2.3 -ENV HADOOP_VERSION 2.3.0 +ENV SPARK_PROFILE 2.1 +ENV SPARK_VERSION 2.1.1 +ENV HADOOP_PROFILE 2.7 +ENV HADOOP_VERSION 2.7.0 # Update the image with the latest packages RUN yum update -y; yum clean all http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f10b71cc/scripts/docker/spark-cluster-managers/spark_standalone/Dockerfile ---------------------------------------------------------------------- diff --git a/scripts/docker/spark-cluster-managers/spark_standalone/Dockerfile b/scripts/docker/spark-cluster-managers/spark_standalone/Dockerfile index fa3078b..19391d0 100644 --- a/scripts/docker/spark-cluster-managers/spark_standalone/Dockerfile +++ b/scripts/docker/spark-cluster-managers/spark_standalone/Dockerfile @@ -14,9 +14,9 @@ # limitations under the License. FROM centos:centos6 -ENV SPARK_PROFILE 1.6 -ENV SPARK_VERSION 1.6.2 -ENV HADOOP_PROFILE 2.3 +ENV SPARK_PROFILE 2.1 +ENV SPARK_VERSION 2.1.1 +ENV HADOOP_PROFILE 2.7 ENV SPARK_HOME /usr/local/spark # Update the image with the latest packages http://git-wip-us.apache.org/repos/asf/zeppelin/blob/f10b71cc/scripts/docker/spark-cluster-managers/spark_yarn_cluster/Dockerfile ---------------------------------------------------------------------- diff --git a/scripts/docker/spark-cluster-managers/spark_yarn_cluster/Dockerfile b/scripts/docker/spark-cluster-managers/spark_yarn_cluster/Dockerfile index 712c5b2..116d4c3 100644 --- a/scripts/docker/spark-cluster-managers/spark_yarn_cluster/Dockerfile +++ b/scripts/docker/spark-cluster-managers/spark_yarn_cluster/Dockerfile @@ -14,8 +14,8 @@ # limitations under the License. FROM centos:centos6 -ENV SPARK_PROFILE 2.0 -ENV SPARK_VERSION 2.0.0 +ENV SPARK_PROFILE 2.1 +ENV SPARK_VERSION 2.1.1 ENV HADOOP_PROFILE 2.7 ENV HADOOP_VERSION 2.7.0
