diff options
| author | Sean Owen <sowen@cloudera.com> | 2016-03-09 18:27:44 +0000 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2016-03-09 18:27:44 +0000 |
| commit | 256704c771d301700af9ebf0d180c1ba7c4116c0 (patch) | |
| tree | f9be79919b5c6ec4847c24a086fa844555e2cd12 /docker/spark-test/worker | |
| parent | 7791d0c3a9bdfe73e071266846f9ab1491fce50c (diff) | |
| download | spark-256704c771d301700af9ebf0d180c1ba7c4116c0.tar.gz spark-256704c771d301700af9ebf0d180c1ba7c4116c0.tar.bz2 spark-256704c771d301700af9ebf0d180c1ba7c4116c0.zip | |
[SPARK-13595][BUILD] Move docker, extras modules into external
## What changes were proposed in this pull request?
Move `docker` dirs out of top level into `external/`; move `extras/*` into `external/`
## How was this patch tested?
This is tested with Jenkins tests.
Author: Sean Owen <sowen@cloudera.com>
Closes #11523 from srowen/SPARK-13595.
Diffstat (limited to 'docker/spark-test/worker')
| -rw-r--r-- | docker/spark-test/worker/Dockerfile | 22 | ||||
| -rwxr-xr-x | docker/spark-test/worker/default_cmd | 28 |
2 files changed, 0 insertions, 50 deletions
diff --git a/docker/spark-test/worker/Dockerfile b/docker/spark-test/worker/Dockerfile deleted file mode 100644 index 890febe7b6..0000000000 --- a/docker/spark-test/worker/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ -# Spark Worker -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You 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. -# - -FROM spark-test-base -ENV SPARK_WORKER_PORT 8888 -ADD default_cmd /root/ -ENTRYPOINT ["/root/default_cmd"] diff --git a/docker/spark-test/worker/default_cmd b/docker/spark-test/worker/default_cmd deleted file mode 100755 index 31b06cb0eb..0000000000 --- a/docker/spark-test/worker/default_cmd +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You 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. -# - -IP=$(ip -o -4 addr list eth0 | perl -n -e 'if (m{inet\s([\d\.]+)\/\d+\s}xms) { print $1 }') -echo "CONTAINER_IP=$IP" -export SPARK_LOCAL_IP=$IP -export SPARK_PUBLIC_DNS=$IP - -# Avoid the default Docker behavior of mapping our IP address to an unreachable host name -umount /etc/hosts - -/opt/spark/bin/spark-class org.apache.spark.deploy.worker.Worker $1 |