diff --git a/examples/spark/images/base/Dockerfile b/examples/spark/images/base/Dockerfile index 160bcddb975..4217013db3a 100644 --- a/examples/spark/images/base/Dockerfile +++ b/examples/spark/images/base/Dockerfile @@ -1,8 +1,5 @@ FROM java:latest -RUN apt-get update -y -RUN apt-get install -y scala - ENV hadoop_ver 2.6.1 ENV spark_ver 1.5.1 @@ -30,7 +27,6 @@ RUN mkdir -p /opt && \ RUN wget -O /opt/spark/lib/gcs-connector-latest-hadoop2.jar https://storage.googleapis.com/hadoop-lib/gcs/gcs-connector-latest-hadoop2.jar ADD log4j.properties /opt/spark/conf/log4j.properties -ADD setup_client.sh / ADD start-common.sh / ADD core-site.xml /opt/spark/conf/core-site.xml ADD spark-defaults.conf /opt/spark/conf/spark-defaults.conf diff --git a/examples/spark/images/base/setup_client.sh b/examples/spark/images/base/setup_client.sh deleted file mode 100755 index 7fb47258eab..00000000000 --- a/examples/spark/images/base/setup_client.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -# Copyright 2015 The Kubernetes Authors All rights reserved. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -if [[ $# != 2 || $1 == "" || $2 == "" ]]; then - echo "Usage: . ./setup_client.sh master_address master_port" - exit 1 -fi - -echo "$1 spark-master" >> /etc/hosts -export SPARK_LOCAL_HOSTNAME=$(hostname -i) -export MASTER=spark://spark-master:$2