Yikun commented on code in PR #52:
URL: https://github.com/apache/spark-docker/pull/52#discussion_r1358343497
##########
3.4.1/scala2.12-java11-ubuntu/entrypoint.sh:
##########
@@ -77,6 +77,9 @@ elif ! [ -z "${SPARK_HOME+x}" ]; then
SPARK_CLASSPATH="$SPARK_HOME/conf:$SPARK_CLASSPATH";
fi
+# SPARK-43540: add current working directory into executor classpath
Review Comment:
This is 3.5.x series, we might create a `entrypoint.sh.3.4.template`,
`Dockerfile.3.4.template`.
We also
[change](https://github.com/apache/spark-docker/blob/master/add-dockerfiles.sh#L53)
the `add-dockerfiles.sh`, For 3.x.1 version, if `3.x` templates exists, use
3.x template, otherwise use the master entrypoint and Dockerfile directly.
It can be a separate PR.
##########
versions.json:
##########
@@ -40,18 +40,41 @@
"3.4.1"
]
},
+ {
+ "path": "3.4.1/scala2.13-java11-python3-ubuntu",
+ "tags": [
+ "3.4.1-scala2.13-java11-python3-ubuntu"
+ ]
+ },
{
"path": "3.4.1/scala2.12-java11-r-ubuntu",
"tags": [
"3.4.1-scala2.12-java11-r-ubuntu",
"3.4.1-r"
]
},
+ {
+ "path": "3.4.1/scala2.13-java11-r-ubuntu",
+ "tags": [
+ "3.4.1-scala2.13-java11-r-ubuntu"
+ ]
+ },
{
"path": "3.4.1/scala2.12-java11-ubuntu",
"tags": [
"3.4.1-scala2.12-java11-ubuntu",
- "3.4.1-scala"
+ "3.4.1-scala2.12",
+ "scala2.12",
+ "3.4.1-scala",
+ "scala"
Review Comment:
scala should be removed, because it's 3.5.0 now
##########
3.4.1/scala2.12-java11-ubuntu/entrypoint.sh:
##########
@@ -77,6 +77,9 @@ elif ! [ -z "${SPARK_HOME+x}" ]; then
SPARK_CLASSPATH="$SPARK_HOME/conf:$SPARK_CLASSPATH";
fi
+# SPARK-43540: add current working directory into executor classpath
Review Comment:
cc @HyukjinKwon @zhengruifeng @dongjoon-hyun
Or we could just apply master dockerfile changes in 3.4-branches?
##########
.github/workflows/build_3.4.1.yaml:
##########
@@ -24,18 +24,18 @@ on:
branches:
- 'master'
paths:
- - '3.4.1/**'
+ - '3.4.1/scala2.**'
jobs:
run-build:
strategy:
matrix:
image-type: ["all", "python", "scala", "r"]
+ scala: ["2.13","2.12"]
name: Run
secrets: inherit
uses: ./.github/workflows/main.yml
with:
spark: 3.4.1
- scala: 2.12
Review Comment:
This shouldn't be removed, so CI is break (not triggered).
Try
```bash
scala: ${{ matrix.scala }}
```
[1] https://github.com/apache/spark-docker/actions/runs/6398139681/workflow
##########
3.4.1/scala2.12-java11-ubuntu/entrypoint.sh:
##########
@@ -90,6 +93,7 @@ case "$1" in
CMD=(
"$SPARK_HOME/bin/spark-submit"
--conf "spark.driver.bindAddress=$SPARK_DRIVER_BIND_ADDRESS"
+ --conf "spark.executorEnv.SPARK_DRIVER_POD_IP=$SPARK_DRIVER_BIND_ADDRESS"
Review Comment:
ditto
##########
versions.json:
##########
@@ -40,18 +40,41 @@
"3.4.1"
]
},
+ {
+ "path": "3.4.1/scala2.13-java11-python3-ubuntu",
+ "tags": [
+ "3.4.1-scala2.13-java11-python3-ubuntu"
+ ]
+ },
{
"path": "3.4.1/scala2.12-java11-r-ubuntu",
"tags": [
"3.4.1-scala2.12-java11-r-ubuntu",
"3.4.1-r"
]
},
+ {
+ "path": "3.4.1/scala2.13-java11-r-ubuntu",
+ "tags": [
+ "3.4.1-scala2.13-java11-r-ubuntu"
+ ]
+ },
{
"path": "3.4.1/scala2.12-java11-ubuntu",
"tags": [
"3.4.1-scala2.12-java11-ubuntu",
- "3.4.1-scala"
+ "3.4.1-scala2.12",
+ "scala2.12",
Review Comment:
scala2.12 should be removed, because it's 3.5.0 now
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
