Repository: spark
Updated Branches:
refs/heads/master b304e07e0 -> d5b41aea6
[SPARK-23618][K8S][BUILD] Initialize BUILD_ARGS in docker-image-tool.sh
## What changes were proposed in this pull request?
This change initializes BUILD_ARGS to an empty array when $SPARK_HOME/RELEASE
exists.
In function build, "local BUILD_ARGS" effectively creates an array of one
element where the first and only element is an empty string, so
"${BUILD_ARGS[]}" expands to "" and passes an extra argument to docker.
Setting BUILD_ARGS to an empty array makes "${BUILD_ARGS[]}" expand to nothing.
## How was this patch tested?
Manually tested.
$ cat RELEASE
Spark 2.3.0 (git revision a0d7949896) built for Hadoop 2.7.3
Build flags: -Phadoop-2.7 -Phive -Phive-thriftserver -Pkafka-0-8 -Pmesos -Pyarn
-Pkubernetes -Pflume -Psparkr -DzincPort=3036
$ ./bin/docker-image-tool.sh -m t testing build
Sending build context to Docker daemon 256.4MB
...
vanzin
Author: Jooseong Kim <joose...@pinterest.com>
Closes #20791 from jooseong/SPARK-23618.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/d5b41aea
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/d5b41aea
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/d5b41aea
Branch: refs/heads/master
Commit: d5b41aea62201cd5b1baad2f68f5fc7eb99c62c5
Parents: b304e07
Author: Jooseong Kim <joose...@pinterest.com>
Authored: Mon Mar 12 11:31:34 2018 -0700
Committer: foxish <ramanath...@google.com>
Committed: Mon Mar 12 11:31:34 2018 -0700
----------------------------------------------------------------------
bin/docker-image-tool.sh | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/d5b41aea/bin/docker-image-tool.sh
----------------------------------------------------------------------
diff --git a/bin/docker-image-tool.sh b/bin/docker-image-tool.sh
index 0714063..0d0f564 100755
--- a/bin/docker-image-tool.sh
+++ b/bin/docker-image-tool.sh
@@ -57,6 +57,7 @@ function build {
else
# Not passed as an argument to docker, but used to validate the Spark
directory.
IMG_PATH="kubernetes/dockerfiles"
+ BUILD_ARGS=()
fi
if [ ! -d "$IMG_PATH" ]; then
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
