You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ho...@apache.org on 2021/01/28 19:58:08 UTC
[spark] branch master updated: [SPARK-32866][K8S] Fix docker
cross-build
This is an automated email from the ASF dual-hosted git repository.
holden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 497f599 [SPARK-32866][K8S] Fix docker cross-build
497f599 is described below
commit 497f599a37d2250c14a7bd2699bd3ac65bd08a58
Author: Holden Karau <hk...@apple.com>
AuthorDate: Thu Jan 28 11:57:42 2021 -0800
[SPARK-32866][K8S] Fix docker cross-build
### What changes were proposed in this pull request?
Add `--push` to the docker script for buildx
### Why are the changes needed?
Doing a separate docker push with `buildx` images doesn't work.
### Does this PR introduce _any_ user-facing change?
Automatically pushes work when cross-building.
### How was this patch tested?
cross-built docker containers
Closes #31299 from holdenk/SPARK-32866-docker-buildx-update.
Authored-by: Holden Karau <hk...@apple.com>
Signed-off-by: Holden Karau <hk...@apple.com>
---
bin/docker-image-tool.sh | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/bin/docker-image-tool.sh b/bin/docker-image-tool.sh
index 2ec1ab8..83b13b8 100755
--- a/bin/docker-image-tool.sh
+++ b/bin/docker-image-tool.sh
@@ -181,7 +181,7 @@ function build {
error "Failed to build Spark JVM Docker image, please refer to Docker build output for details."
fi
if [ "${CROSS_BUILD}" != "false" ]; then
- (cd $(img_ctx_dir base) && docker buildx build $ARCHS $NOCACHEARG "${BUILD_ARGS[@]}" \
+ (cd $(img_ctx_dir base) && docker buildx build $ARCHS $NOCACHEARG "${BUILD_ARGS[@]}" --push \
-t $(image_ref spark) \
-f "$BASEDOCKERFILE" .)
fi
@@ -194,7 +194,7 @@ function build {
error "Failed to build PySpark Docker image, please refer to Docker build output for details."
fi
if [ "${CROSS_BUILD}" != "false" ]; then
- (cd $(img_ctx_dir pyspark) && docker buildx build $ARCHS $NOCACHEARG "${BINDING_BUILD_ARGS[@]}" \
+ (cd $(img_ctx_dir pyspark) && docker buildx build $ARCHS $NOCACHEARG "${BINDING_BUILD_ARGS[@]}" --push \
-t $(image_ref spark-py) \
-f "$PYDOCKERFILE" .)
fi
@@ -208,7 +208,7 @@ function build {
error "Failed to build SparkR Docker image, please refer to Docker build output for details."
fi
if [ "${CROSS_BUILD}" != "false" ]; then
- (cd $(img_ctx_dir sparkr) && docker buildx build $ARCHS $NOCACHEARG "${BINDING_BUILD_ARGS[@]}" \
+ (cd $(img_ctx_dir sparkr) && docker buildx build $ARCHS $NOCACHEARG "${BINDING_BUILD_ARGS[@]}" --push \
-t $(image_ref spark-r) \
-f "$RDOCKERFILE" .)
fi
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org