This is an automated email from the ASF dual-hosted git repository.
ibzib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 3b4befd [BEAM-9022] publish Spark job server Docker image
new a24bc3b Merge pull request #10921 from ibzib/spark-container-publish
3b4befd is described below
commit 3b4befd1541dd3e9a0408dfb8f11363216e02753
Author: Kyle Weaver <[email protected]>
AuthorDate: Thu Feb 20 16:38:40 2020 -0800
[BEAM-9022] publish Spark job server Docker image
---
release/src/main/scripts/build_release_candidate.sh | 4 ++++
release/src/main/scripts/publish_docker_images.sh | 19 +++++++++++++++++++
runners/spark/job-server/container/build.gradle | 2 +-
website/src/contribute/release-guide.md | 7 +++++++
4 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/release/src/main/scripts/build_release_candidate.sh
b/release/src/main/scripts/build_release_candidate.sh
index a367b60..fd9fd0f 100755
--- a/release/src/main/scripts/build_release_candidate.sh
+++ b/release/src/main/scripts/build_release_candidate.sh
@@ -236,6 +236,9 @@ if [[ $confirmation = "y" ]]; then
./gradlew ":runners:flink:${ver}:job-server-container:dockerPush"
-Pdocker-tag="${RELEASE}_rc${RC_NUM}"
done
+ echo '-------------Generating and Pushing Spark job server
image-------------'
+ ./gradlew ":runners:spark:job-server:container:dockerPush"
-Pdocker-tag="${RELEASE}_rc${RC_NUM}"
+
rm -rf ~/${PYTHON_ARTIFACTS_DIR}
echo '-------------------Clean up images at local-----------------'
@@ -247,6 +250,7 @@ if [[ $confirmation = "y" ]]; then
for ver in "${FLINK_VER[@]}"; do
docker rmi -f "apachebeam/flink${ver}_job_server:${RELEASE}_rc${RC_NUM}"
done
+ docker rmi -f "apachebeam/spark_job_server:${RELEASE}_rc${RC_NUM}"
fi
echo "[Current Step]: Update beam-site"
diff --git a/release/src/main/scripts/publish_docker_images.sh
b/release/src/main/scripts/publish_docker_images.sh
index e80c446..c4d5e16 100755
--- a/release/src/main/scripts/publish_docker_images.sh
+++ b/release/src/main/scripts/publish_docker_images.sh
@@ -119,4 +119,23 @@ if [[ $confirmation = "y" ]]; then
docker rmi -f "${FLINK_IMAGE_NAME}:${RELEASE}"
docker rmi -f "${FLINK_IMAGE_NAME}:latest"
done
+
+ echo '-------------Generating and Pushing Spark job server
image-------------'
+ SPARK_IMAGE_NAME="apachebeam/spark_job_server"
+
+ # Pull verified RC from dockerhub.
+ docker pull "${SPARK_IMAGE_NAME}:${RELEASE}_${RC_VERSION}"
+
+ # Tag with ${RELEASE} and push to dockerhub.
+ docker tag "${SPARK_IMAGE_NAME}:${RELEASE}_${RC_VERSION}"
"${SPARK_IMAGE_NAME}:${RELEASE}"
+ docker push "${SPARK_IMAGE_NAME}:${RELEASE}"
+
+ # Tag with latest and push to dockerhub.
+ docker tag "${SPARK_IMAGE_NAME}:${RELEASE}_${RC_VERSION}"
"${SPARK_IMAGE_NAME}:latest"
+ docker push "${SPARK_IMAGE_NAME}:latest"
+
+ # Cleanup images from local
+ docker rmi -f "${SPARK_IMAGE_NAME}:${RELEASE}_${RC_VERSION}"
+ docker rmi -f "${SPARK_IMAGE_NAME}:${RELEASE}"
+ docker rmi -f "${SPARK_IMAGE_NAME}:latest"
fi
diff --git a/runners/spark/job-server/container/build.gradle
b/runners/spark/job-server/container/build.gradle
index c7244a3..c68ffed 100644
--- a/runners/spark/job-server/container/build.gradle
+++ b/runners/spark/job-server/container/build.gradle
@@ -54,7 +54,7 @@ task copyDockerfileDependencies(type: Copy) {
}
docker {
- name containerImageName(name: 'spark-job-server',
+ name containerImageName(name: 'spark_job_server',
root:
project.rootProject.hasProperty(["docker-repository-root"]) ?
project.rootProject["docker-repository-root"] : "apachebeam")
files "./build/"
diff --git a/website/src/contribute/release-guide.md
b/website/src/contribute/release-guide.md
index 137e691..10a6ac6 100644
--- a/website/src/contribute/release-guide.md
+++ b/website/src/contribute/release-guide.md
@@ -717,6 +717,12 @@ for ver in "${FLINK_VER[@]}"; do
done
```
+* Build Spark job server image and push to DockerHub.
+
+```
+./gradlew ":runners:spark:job-server:container:dockerPush"
-Pdocker-tag="${RELEASE}_rc${RC_NUM}"
+```
+
Clean up images from local
```
@@ -728,6 +734,7 @@ docker rmi -f apachebeam/go_sdk:${RELEASE}_rc{RC_NUM}
for ver in "${FLINK_VER[@]}"; do
docker rmi -f "apachebeam/flink${ver}_job_server:${RELEASE}_rc${RC_NUM}"
done
+docker rmi -f "apachebeam/spark_job_server:${RELEASE}_rc${RC_NUM}"
```
