Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update spark 3.5 from 3.5.2 to 3.5.3 #17698

Merged
merged 3 commits into from
Oct 10, 2024
Merged

Conversation

yaooqinn
Copy link
Contributor

@yaooqinn yaooqinn commented Oct 9, 2024

@yaooqinn yaooqinn requested a review from a team as a code owner October 9, 2024 11:47

This comment has been minimized.

@tianon
Copy link
Member

tianon commented Oct 9, 2024

See also #17696, especially #17696 (comment), which points to #17622 (comment), which applies to this update too.

I guess apache/spark-docker#73 should've applied to more versions?

@ravisanwal ravisanwal mentioned this pull request Oct 9, 2024
@yaooqinn
Copy link
Contributor Author

Thank you @tianon. I have updated the scripts for 3.5.3

This comment has been minimized.

Copy link

Diff for 4dbc37c:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index dfcdb83..5374fc0 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -21,45 +21,45 @@ Architectures: amd64, arm64v8
 GitCommit: 6f10acb452a360966ec9a971641280b7b4a3619a
 Directory: 3.4.3/scala2.12-java11-ubuntu
 
-Tags: 3.5.2-scala2.12-java11-python3-r-ubuntu
+Tags: 3.5.3-scala2.12-java11-python3-r-ubuntu
 Architectures: amd64, arm64v8
-GitCommit: b9f1f8e8ebed1959c2be3864a114b52f67519092
-Directory: 3.5.2/scala2.12-java11-python3-r-ubuntu
+GitCommit: cf333e1f7403fa68c7b359cff77b7949ec0990b3
+Directory: 3.5.3/scala2.12-java11-python3-r-ubuntu
 
-Tags: 3.5.2-scala2.12-java11-python3-ubuntu, 3.5.2-python3, 3.5.2, python3, latest
+Tags: 3.5.3-scala2.12-java11-python3-ubuntu, 3.5.3-python3, 3.5.3, python3, latest
 Architectures: amd64, arm64v8
-GitCommit: b9f1f8e8ebed1959c2be3864a114b52f67519092
-Directory: 3.5.2/scala2.12-java11-python3-ubuntu
+GitCommit: cf333e1f7403fa68c7b359cff77b7949ec0990b3
+Directory: 3.5.3/scala2.12-java11-python3-ubuntu
 
-Tags: 3.5.2-scala2.12-java11-r-ubuntu, 3.5.2-r, r
+Tags: 3.5.3-scala2.12-java11-r-ubuntu, 3.5.3-r, r
 Architectures: amd64, arm64v8
-GitCommit: b9f1f8e8ebed1959c2be3864a114b52f67519092
-Directory: 3.5.2/scala2.12-java11-r-ubuntu
+GitCommit: cf333e1f7403fa68c7b359cff77b7949ec0990b3
+Directory: 3.5.3/scala2.12-java11-r-ubuntu
 
-Tags: 3.5.2-scala2.12-java11-ubuntu, 3.5.2-scala, scala
+Tags: 3.5.3-scala2.12-java11-ubuntu, 3.5.3-scala, scala
 Architectures: amd64, arm64v8
-GitCommit: b9f1f8e8ebed1959c2be3864a114b52f67519092
-Directory: 3.5.2/scala2.12-java11-ubuntu
+GitCommit: cf333e1f7403fa68c7b359cff77b7949ec0990b3
+Directory: 3.5.3/scala2.12-java11-ubuntu
 
-Tags: 3.5.2-scala2.12-java17-python3-r-ubuntu
+Tags: 3.5.3-scala2.12-java17-python3-r-ubuntu
 Architectures: amd64, arm64v8
-GitCommit: b9f1f8e8ebed1959c2be3864a114b52f67519092
-Directory: 3.5.2/scala2.12-java17-python3-r-ubuntu
+GitCommit: cf333e1f7403fa68c7b359cff77b7949ec0990b3
+Directory: 3.5.3/scala2.12-java17-python3-r-ubuntu
 
-Tags: 3.5.2-scala2.12-java17-python3-ubuntu, 3.5.2-java17-python3, 3.5.2-java17, python3-java17
+Tags: 3.5.3-scala2.12-java17-python3-ubuntu, 3.5.3-java17-python3, 3.5.3-java17, python3-java17
 Architectures: amd64, arm64v8
-GitCommit: b9f1f8e8ebed1959c2be3864a114b52f67519092
-Directory: 3.5.2/scala2.12-java17-python3-ubuntu
+GitCommit: cf333e1f7403fa68c7b359cff77b7949ec0990b3
+Directory: 3.5.3/scala2.12-java17-python3-ubuntu
 
-Tags: 3.5.2-scala2.12-java17-r-ubuntu, 3.5.2-java17-r
+Tags: 3.5.3-scala2.12-java17-r-ubuntu, 3.5.3-java17-r
 Architectures: amd64, arm64v8
-GitCommit: b9f1f8e8ebed1959c2be3864a114b52f67519092
-Directory: 3.5.2/scala2.12-java17-r-ubuntu
+GitCommit: cf333e1f7403fa68c7b359cff77b7949ec0990b3
+Directory: 3.5.3/scala2.12-java17-r-ubuntu
 
-Tags: 3.5.2-scala2.12-java17-ubuntu, 3.5.2-java17-scala
+Tags: 3.5.3-scala2.12-java17-ubuntu, 3.5.3-java17-scala
 Architectures: amd64, arm64v8
-GitCommit: b9f1f8e8ebed1959c2be3864a114b52f67519092
-Directory: 3.5.2/scala2.12-java17-ubuntu
+GitCommit: cf333e1f7403fa68c7b359cff77b7949ec0990b3
+Directory: 3.5.3/scala2.12-java17-ubuntu
 
 Tags: 4.0.0-preview2-scala2.13-java17-python3-r-ubuntu
 Architectures: amd64, arm64v8
diff --git a/_bashbrew-list b/_bashbrew-list
index 5a0fa41..61f802e 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,22 +6,22 @@ spark:3.4.3-scala2.12-java11-python3-r-ubuntu
 spark:3.4.3-scala2.12-java11-python3-ubuntu
 spark:3.4.3-scala2.12-java11-r-ubuntu
 spark:3.4.3-scala2.12-java11-ubuntu
-spark:3.5.2
-spark:3.5.2-java17
-spark:3.5.2-java17-python3
-spark:3.5.2-java17-r
-spark:3.5.2-java17-scala
-spark:3.5.2-python3
-spark:3.5.2-r
-spark:3.5.2-scala
-spark:3.5.2-scala2.12-java11-python3-r-ubuntu
-spark:3.5.2-scala2.12-java11-python3-ubuntu
-spark:3.5.2-scala2.12-java11-r-ubuntu
-spark:3.5.2-scala2.12-java11-ubuntu
-spark:3.5.2-scala2.12-java17-python3-r-ubuntu
-spark:3.5.2-scala2.12-java17-python3-ubuntu
-spark:3.5.2-scala2.12-java17-r-ubuntu
-spark:3.5.2-scala2.12-java17-ubuntu
+spark:3.5.3
+spark:3.5.3-java17
+spark:3.5.3-java17-python3
+spark:3.5.3-java17-r
+spark:3.5.3-java17-scala
+spark:3.5.3-python3
+spark:3.5.3-r
+spark:3.5.3-scala
+spark:3.5.3-scala2.12-java11-python3-r-ubuntu
+spark:3.5.3-scala2.12-java11-python3-ubuntu
+spark:3.5.3-scala2.12-java11-r-ubuntu
+spark:3.5.3-scala2.12-java11-ubuntu
+spark:3.5.3-scala2.12-java17-python3-r-ubuntu
+spark:3.5.3-scala2.12-java17-python3-ubuntu
+spark:3.5.3-scala2.12-java17-r-ubuntu
+spark:3.5.3-scala2.12-java17-ubuntu
 spark:4.0.0-preview2
 spark:4.0.0-preview2-java21
 spark:4.0.0-preview2-java21-python3
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 3536513..89ac45d 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,7 +1,7 @@
 spark:3.4.3-scala
 spark:3.4.3-scala2.12-java11-python3-r-ubuntu
-spark:3.5.2-java17-scala
-spark:3.5.2-scala2.12-java17-python3-r-ubuntu
+spark:3.5.3-java17-scala
+spark:3.5.3-scala2.12-java17-python3-r-ubuntu
 spark:4.0.0-preview2-java21-scala
 spark:4.0.0-preview2-scala
 spark:4.0.0-preview2-scala2.13-java17-python3-r-ubuntu
@@ -10,8 +10,8 @@ spark:python3-java17
 spark:scala
 spark:3.4.3
 spark:3.4.3-r
-spark:3.5.2-java17-r
-spark:3.5.2-scala2.12-java11-python3-r-ubuntu
+spark:3.5.3-java17-r
+spark:3.5.3-scala2.12-java11-python3-r-ubuntu
 spark:4.0.0-preview2
 spark:4.0.0-preview2-java21
 spark:4.0.0-preview2-java21-r
diff --git a/spark_3.5.2-java17-r/Dockerfile b/spark_3.5.3-java17-r/Dockerfile
similarity index 95%
rename from spark_3.5.2-java17-r/Dockerfile
rename to spark_3.5.3-java17-r/Dockerfile
index 46c55fc..171fa66 100644
--- a/spark_3.5.2-java17-r/Dockerfile
+++ b/spark_3.5.3-java17-r/Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM spark:3.5.2-scala2.12-java17-ubuntu
+FROM spark:3.5.3-scala2.12-java17-ubuntu
 
 USER root
 
diff --git a/spark_3.5.2-java17-scala/Dockerfile b/spark_3.5.3-java17-scala/Dockerfile
similarity index 89%
rename from spark_3.5.2-java17-scala/Dockerfile
rename to spark_3.5.3-java17-scala/Dockerfile
index 280bd0c..bbe1fe7 100644
--- a/spark_3.5.2-java17-scala/Dockerfile
+++ b/spark_3.5.3-java17-scala/Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM eclipse-temurin:17-jre-jammy
+FROM eclipse-temurin:17-jammy
 
 ARG spark_uid=185
 
@@ -36,9 +36,9 @@ RUN set -ex; \
 
 # Install Apache Spark
 # https://downloads.apache.org/spark/KEYS
-ENV SPARK_TGZ_URL=https://archive.apache.org/dist/spark/spark-3.5.2/spark-3.5.2-bin-hadoop3.tgz \
-    SPARK_TGZ_ASC_URL=https://archive.apache.org/dist/spark/spark-3.5.2/spark-3.5.2-bin-hadoop3.tgz.asc \
-    GPG_KEY=D76E23B9F11B5BF6864613C4F7051850A0AF904D
+ENV SPARK_TGZ_URL=https://archive.apache.org/dist/spark/spark-3.5.3/spark-3.5.3-bin-hadoop3.tgz \
+    SPARK_TGZ_ASC_URL=https://archive.apache.org/dist/spark/spark-3.5.3/spark-3.5.3-bin-hadoop3.tgz.asc \
+    GPG_KEY=0A2D660358B6F6F8071FD16F6606986CF5A8447C
 
 RUN set -ex; \
     export SPARK_TMP="$(mktemp -d)"; \
@@ -55,10 +55,12 @@ RUN set -ex; \
     tar -xf spark.tgz --strip-components=1; \
     chown -R spark:spark .; \
     mv jars /opt/spark/; \
+    mv RELEASE /opt/spark/; \
     mv bin /opt/spark/; \
     mv sbin /opt/spark/; \
     mv kubernetes/dockerfiles/spark/decom.sh /opt/; \
     mv examples /opt/spark/; \
+    ln -s "$(basename /opt/spark/examples/jars/spark-examples_*.jar)" /opt/spark/examples/jars/spark-examples.jar; \
     mv kubernetes/tests /opt/spark/; \
     mv data /opt/spark/; \
     mv python/pyspark /opt/spark/python/pyspark/; \
diff --git a/spark_3.5.2-java17-scala/entrypoint.sh b/spark_3.5.3-java17-scala/entrypoint.sh
similarity index 100%
rename from spark_3.5.2-java17-scala/entrypoint.sh
rename to spark_3.5.3-java17-scala/entrypoint.sh
diff --git a/spark_3.5.2-scala2.12-java17-python3-r-ubuntu/Dockerfile b/spark_3.5.3-scala2.12-java11-python3-r-ubuntu/Dockerfile
similarity index 96%
rename from spark_3.5.2-scala2.12-java17-python3-r-ubuntu/Dockerfile
rename to spark_3.5.3-scala2.12-java11-python3-r-ubuntu/Dockerfile
index 80dda3b..b7f4cc6 100644
--- a/spark_3.5.2-scala2.12-java17-python3-r-ubuntu/Dockerfile
+++ b/spark_3.5.3-scala2.12-java11-python3-r-ubuntu/Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM spark:3.5.2-scala2.12-java17-ubuntu
+FROM spark:3.5.3-scala2.12-java11-ubuntu
 
 USER root
 
diff --git a/spark_3.5.2-scala2.12-java11-python3-r-ubuntu/Dockerfile b/spark_3.5.3-scala2.12-java17-python3-r-ubuntu/Dockerfile
similarity index 96%
rename from spark_3.5.2-scala2.12-java11-python3-r-ubuntu/Dockerfile
rename to spark_3.5.3-scala2.12-java17-python3-r-ubuntu/Dockerfile
index f29cf36..b65c879 100644
--- a/spark_3.5.2-scala2.12-java11-python3-r-ubuntu/Dockerfile
+++ b/spark_3.5.3-scala2.12-java17-python3-r-ubuntu/Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM spark:3.5.2-scala2.12-java11-ubuntu
+FROM spark:3.5.3-scala2.12-java17-ubuntu
 
 USER root
 
diff --git a/spark_latest/Dockerfile b/spark_latest/Dockerfile
index b75bf37..60b10b9 100644
--- a/spark_latest/Dockerfile
+++ b/spark_latest/Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM spark:3.5.2-scala2.12-java11-ubuntu
+FROM spark:3.5.3-scala2.12-java11-ubuntu
 
 USER root
 
diff --git a/spark_python3-java17/Dockerfile b/spark_python3-java17/Dockerfile
index 33bd4cd..f0e7d87 100644
--- a/spark_python3-java17/Dockerfile
+++ b/spark_python3-java17/Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM spark:3.5.2-scala2.12-java17-ubuntu
+FROM spark:3.5.3-scala2.12-java17-ubuntu
 
 USER root
 
diff --git a/spark_r/Dockerfile b/spark_r/Dockerfile
index ef88397..3b76da8 100644
--- a/spark_r/Dockerfile
+++ b/spark_r/Dockerfile
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM spark:3.5.2-scala2.12-java11-ubuntu
+FROM spark:3.5.3-scala2.12-java11-ubuntu
 
 USER root
 
diff --git a/spark_scala/Dockerfile b/spark_scala/Dockerfile
index e378d88..903d732 100644
--- a/spark_scala/Dockerfile
+++ b/spark_scala/Dockerfile
@@ -36,9 +36,9 @@ RUN set -ex; \
 
 # Install Apache Spark
 # https://downloads.apache.org/spark/KEYS
-ENV SPARK_TGZ_URL=https://archive.apache.org/dist/spark/spark-3.5.2/spark-3.5.2-bin-hadoop3.tgz \
-    SPARK_TGZ_ASC_URL=https://archive.apache.org/dist/spark/spark-3.5.2/spark-3.5.2-bin-hadoop3.tgz.asc \
-    GPG_KEY=D76E23B9F11B5BF6864613C4F7051850A0AF904D
+ENV SPARK_TGZ_URL=https://archive.apache.org/dist/spark/spark-3.5.3/spark-3.5.3-bin-hadoop3.tgz \
+    SPARK_TGZ_ASC_URL=https://archive.apache.org/dist/spark/spark-3.5.3/spark-3.5.3-bin-hadoop3.tgz.asc \
+    GPG_KEY=0A2D660358B6F6F8071FD16F6606986CF5A8447C
 
 RUN set -ex; \
     export SPARK_TMP="$(mktemp -d)"; \
@@ -55,10 +55,12 @@ RUN set -ex; \
     tar -xf spark.tgz --strip-components=1; \
     chown -R spark:spark .; \
     mv jars /opt/spark/; \
+    mv RELEASE /opt/spark/; \
     mv bin /opt/spark/; \
     mv sbin /opt/spark/; \
     mv kubernetes/dockerfiles/spark/decom.sh /opt/; \
     mv examples /opt/spark/; \
+    ln -s "$(basename /opt/spark/examples/jars/spark-examples_*.jar)" /opt/spark/examples/jars/spark-examples.jar; \
     mv kubernetes/tests /opt/spark/; \
     mv data /opt/spark/; \
     mv python/pyspark /opt/spark/python/pyspark/; \

Relevant Maintainers:

@tianon tianon merged commit e903f39 into docker-library:master Oct 10, 2024
10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants