Update Scala to 2.11.8, Spark to 2.0.0

raster-foundry · Sep 24, 2016 · 00db762 · 00db762
1 parent cc96ffb
commit 00db762
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/docker-compose.spark.yml b/docker-compose.spark.yml
@@ -5,7 +5,7 @@ services:
     build:
       context: ./worker-tasks
       dockerfile: Dockerfile
-    image: quay.io/azavea/spark:1.6.2
+    image: quay.io/azavea/spark:2.0.0
     restart: always
     ports:
       - "7077:7077"
@@ -25,7 +25,7 @@ services:
     command: org.apache.spark.deploy.master.Master
 
   spark-worker:
-    image: quay.io/azavea/spark:1.6.2
+    image: quay.io/azavea/spark:2.0.0
     links:
       - spark-master:spark.services.rf.internal
     environment:
@@ -43,7 +43,7 @@ services:
       - "spark://spark.services.rf.internal:7077"
 
   spark-driver:
-    image: quay.io/azavea/spark:1.6.2
+    image: quay.io/azavea/spark:2.0.0
     links:
       - spark-master:spark.services.rf.internal
     environment:

diff --git a/worker-tasks/Dockerfile b/worker-tasks/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/azavea/spark:1.6.2
+FROM quay.io/azavea/spark:2.0.0
 
 USER root
 

diff --git a/worker-tasks/build.sbt b/worker-tasks/build.sbt
@@ -2,6 +2,6 @@ name := "rf-worker"
 
 version := "0.1.0"
 
-scalaVersion := "2.11.1"
+scalaVersion := "2.11.8"
 
-libraryDependencies += "org.apache.spark" %% "spark-core" % "1.6.2"
+libraryDependencies += "org.apache.spark" %% "spark-core" % "2.0.0"