You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by va...@apache.org on 2018/01/06 01:29:33 UTC
spark git commit: [SPARK-22960][K8S] Revert use of ARG base_image in
images
Repository: spark
Updated Branches:
refs/heads/master e8af7e8ae -> bf65cd3cd
[SPARK-22960][K8S] Revert use of ARG base_image in images
## What changes were proposed in this pull request?
This PR reverts the `ARG base_image` before `FROM` in the images of driver, executor, and init-container, introduced in https://github.com/apache/spark/pull/20154. The reason is Docker versions before 17.06 do not support this use (`ARG` before `FROM`).
## How was this patch tested?
Tested manually.
vanzin foxish kimoonkim
Author: Yinan Li <li...@gmail.com>
Closes #20170 from liyinan926/master.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/bf65cd3c
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/bf65cd3c
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/bf65cd3c
Branch: refs/heads/master
Commit: bf65cd3cda46d5480bfcd13110975c46ca631972
Parents: e8af7e8
Author: Yinan Li <li...@gmail.com>
Authored: Fri Jan 5 17:29:27 2018 -0800
Committer: Marcelo Vanzin <va...@cloudera.com>
Committed: Fri Jan 5 17:29:27 2018 -0800
----------------------------------------------------------------------
.../kubernetes/docker/src/main/dockerfiles/driver/Dockerfile | 3 +--
.../docker/src/main/dockerfiles/executor/Dockerfile | 3 +--
.../docker/src/main/dockerfiles/init-container/Dockerfile | 3 +--
sbin/build-push-docker-images.sh | 8 ++++----
4 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/bf65cd3c/resource-managers/kubernetes/docker/src/main/dockerfiles/driver/Dockerfile
----------------------------------------------------------------------
diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/driver/Dockerfile b/resource-managers/kubernetes/docker/src/main/dockerfiles/driver/Dockerfile
index ff5289e..45fbcd9 100644
--- a/resource-managers/kubernetes/docker/src/main/dockerfiles/driver/Dockerfile
+++ b/resource-managers/kubernetes/docker/src/main/dockerfiles/driver/Dockerfile
@@ -15,8 +15,7 @@
# limitations under the License.
#
-ARG base_image
-FROM ${base_image}
+FROM spark-base
# Before building the docker image, first build and make a Spark distribution following
# the instructions in http://spark.apache.org/docs/latest/building-spark.html.
http://git-wip-us.apache.org/repos/asf/spark/blob/bf65cd3c/resource-managers/kubernetes/docker/src/main/dockerfiles/executor/Dockerfile
----------------------------------------------------------------------
diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/executor/Dockerfile b/resource-managers/kubernetes/docker/src/main/dockerfiles/executor/Dockerfile
index 3eabb42..0f806cf 100644
--- a/resource-managers/kubernetes/docker/src/main/dockerfiles/executor/Dockerfile
+++ b/resource-managers/kubernetes/docker/src/main/dockerfiles/executor/Dockerfile
@@ -15,8 +15,7 @@
# limitations under the License.
#
-ARG base_image
-FROM ${base_image}
+FROM spark-base
# Before building the docker image, first build and make a Spark distribution following
# the instructions in http://spark.apache.org/docs/latest/building-spark.html.
http://git-wip-us.apache.org/repos/asf/spark/blob/bf65cd3c/resource-managers/kubernetes/docker/src/main/dockerfiles/init-container/Dockerfile
----------------------------------------------------------------------
diff --git a/resource-managers/kubernetes/docker/src/main/dockerfiles/init-container/Dockerfile b/resource-managers/kubernetes/docker/src/main/dockerfiles/init-container/Dockerfile
index e0a249e..047056a 100644
--- a/resource-managers/kubernetes/docker/src/main/dockerfiles/init-container/Dockerfile
+++ b/resource-managers/kubernetes/docker/src/main/dockerfiles/init-container/Dockerfile
@@ -15,8 +15,7 @@
# limitations under the License.
#
-ARG base_image
-FROM ${base_image}
+FROM spark-base
# If this docker file is being used in the context of building your images from a Spark distribution, the docker build
# command should be invoked from the top level directory of the Spark distribution. E.g.:
http://git-wip-us.apache.org/repos/asf/spark/blob/bf65cd3c/sbin/build-push-docker-images.sh
----------------------------------------------------------------------
diff --git a/sbin/build-push-docker-images.sh b/sbin/build-push-docker-images.sh
index bb8806d..b953259 100755
--- a/sbin/build-push-docker-images.sh
+++ b/sbin/build-push-docker-images.sh
@@ -60,13 +60,13 @@ function image_ref {
}
function build {
- local base_image="$(image_ref spark-base 0)"
- docker build --build-arg "spark_jars=$SPARK_JARS" \
+ docker build \
+ --build-arg "spark_jars=$SPARK_JARS" \
--build-arg "img_path=$IMG_PATH" \
- -t "$base_image" \
+ -t spark-base \
-f "$IMG_PATH/spark-base/Dockerfile" .
for image in "${!path[@]}"; do
- docker build --build-arg "base_image=$base_image" -t "$(image_ref $image)" -f ${path[$image]} .
+ docker build -t "$(image_ref $image)" -f ${path[$image]} .
done
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org