spark-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject git commit: [SPARK-1055] fix the SCALA_VERSION and SPARK_VERSION in docker file
Date Sat, 22 Feb 2014 23:39:35 GMT
Repository: incubator-spark
Updated Branches:
  refs/heads/master 722199fab -> 1aa4f8af7


[SPARK-1055] fix the SCALA_VERSION and SPARK_VERSION in docker file

As reported in https://spark-project.atlassian.net/browse/SPARK-1055

"The used Spark version in the .../base/Dockerfile is stale on 0.8.1 and should be updated
to 0.9.x to match the release."

Author: CodingCat <zhunansjtu@gmail.com>
Author: Nan Zhu <CodingCat@users.noreply.github.com>

Closes #634 from CodingCat/SPARK-1055 and squashes the following commits:

cb7330e [Nan Zhu] Update Dockerfile
adf8259 [CodingCat] fix the SCALA_VERSION and SPARK_VERSION in docker file


Project: http://git-wip-us.apache.org/repos/asf/incubator-spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-spark/commit/1aa4f8af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-spark/tree/1aa4f8af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-spark/diff/1aa4f8af

Branch: refs/heads/master
Commit: 1aa4f8af7220bc311196ef0eef0a4814cd2757d3
Parents: 722199f
Author: CodingCat <zhunansjtu@gmail.com>
Authored: Sat Feb 22 15:39:25 2014 -0800
Committer: Aaron Davidson <aaron@databricks.com>
Committed: Sat Feb 22 15:39:25 2014 -0800

----------------------------------------------------------------------
 docker/spark-test/base/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-spark/blob/1aa4f8af/docker/spark-test/base/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/spark-test/base/Dockerfile b/docker/spark-test/base/Dockerfile
index 6096277..e543db6 100644
--- a/docker/spark-test/base/Dockerfile
+++ b/docker/spark-test/base/Dockerfile
@@ -25,8 +25,7 @@ RUN apt-get update
 # install a few other useful packages plus Open Jdk 7
 RUN apt-get install -y less openjdk-7-jre-headless net-tools vim-tiny sudo openssh-server
 
-ENV SCALA_VERSION 2.9.3
-ENV SPARK_VERSION 0.8.1
+ENV SCALA_VERSION 2.10.3
 ENV CDH_VERSION cdh4
 ENV SCALA_HOME /opt/scala-$SCALA_VERSION
 ENV SPARK_HOME /opt/spark


Mime
View raw message