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.3 to 3.5.4 #18156

Merged
merged 1 commit into from
Dec 24, 2024

Conversation

LuciferYang
Copy link
Contributor

@LuciferYang LuciferYang requested a review from a team as a code owner December 22, 2024 05:55
Copy link

Diff for 25ef033:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 3a69895..635cae1 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -21,45 +21,45 @@ Architectures: amd64, arm64v8
 GitCommit: 18c599ec44230c48fc982eb52d6cdf069883a57d
 Directory: 3.4.4/scala2.12-java11-ubuntu
 
-Tags: 3.5.3-scala2.12-java11-python3-r-ubuntu
+Tags: 3.5.4-scala2.12-java11-python3-r-ubuntu
 Architectures: amd64, arm64v8
-GitCommit: cf333e1f7403fa68c7b359cff77b7949ec0990b3
-Directory: 3.5.3/scala2.12-java11-python3-r-ubuntu
+GitCommit: 6b917ced4279dd7b3a33a81a08db37b3f27e037b
+Directory: 3.5.4/scala2.12-java11-python3-r-ubuntu
 
-Tags: 3.5.3-scala2.12-java11-python3-ubuntu, 3.5.3-python3, 3.5.3, python3, latest
+Tags: 3.5.4-scala2.12-java11-python3-ubuntu, 3.5.4-python3, 3.5.4, python3, latest
 Architectures: amd64, arm64v8
-GitCommit: cf333e1f7403fa68c7b359cff77b7949ec0990b3
-Directory: 3.5.3/scala2.12-java11-python3-ubuntu
+GitCommit: 6b917ced4279dd7b3a33a81a08db37b3f27e037b
+Directory: 3.5.4/scala2.12-java11-python3-ubuntu
 
-Tags: 3.5.3-scala2.12-java11-r-ubuntu, 3.5.3-r, r
+Tags: 3.5.4-scala2.12-java11-r-ubuntu, 3.5.4-r, r
 Architectures: amd64, arm64v8
-GitCommit: cf333e1f7403fa68c7b359cff77b7949ec0990b3
-Directory: 3.5.3/scala2.12-java11-r-ubuntu
+GitCommit: 6b917ced4279dd7b3a33a81a08db37b3f27e037b
+Directory: 3.5.4/scala2.12-java11-r-ubuntu
 
-Tags: 3.5.3-scala2.12-java11-ubuntu, 3.5.3-scala, scala
+Tags: 3.5.4-scala2.12-java11-ubuntu, 3.5.4-scala, scala
 Architectures: amd64, arm64v8
-GitCommit: cf333e1f7403fa68c7b359cff77b7949ec0990b3
-Directory: 3.5.3/scala2.12-java11-ubuntu
+GitCommit: 6b917ced4279dd7b3a33a81a08db37b3f27e037b
+Directory: 3.5.4/scala2.12-java11-ubuntu
 
-Tags: 3.5.3-scala2.12-java17-python3-r-ubuntu
+Tags: 3.5.4-scala2.12-java17-python3-r-ubuntu
 Architectures: amd64, arm64v8
-GitCommit: cf333e1f7403fa68c7b359cff77b7949ec0990b3
-Directory: 3.5.3/scala2.12-java17-python3-r-ubuntu
+GitCommit: 6b917ced4279dd7b3a33a81a08db37b3f27e037b
+Directory: 3.5.4/scala2.12-java17-python3-r-ubuntu
 
-Tags: 3.5.3-scala2.12-java17-python3-ubuntu, 3.5.3-java17-python3, 3.5.3-java17, python3-java17
+Tags: 3.5.4-scala2.12-java17-python3-ubuntu, 3.5.4-java17-python3, 3.5.4-java17, python3-java17
 Architectures: amd64, arm64v8
-GitCommit: cf333e1f7403fa68c7b359cff77b7949ec0990b3
-Directory: 3.5.3/scala2.12-java17-python3-ubuntu
+GitCommit: 6b917ced4279dd7b3a33a81a08db37b3f27e037b
+Directory: 3.5.4/scala2.12-java17-python3-ubuntu
 
-Tags: 3.5.3-scala2.12-java17-r-ubuntu, 3.5.3-java17-r
+Tags: 3.5.4-scala2.12-java17-r-ubuntu, 3.5.4-java17-r
 Architectures: amd64, arm64v8
-GitCommit: cf333e1f7403fa68c7b359cff77b7949ec0990b3
-Directory: 3.5.3/scala2.12-java17-r-ubuntu
+GitCommit: 6b917ced4279dd7b3a33a81a08db37b3f27e037b
+Directory: 3.5.4/scala2.12-java17-r-ubuntu
 
-Tags: 3.5.3-scala2.12-java17-ubuntu, 3.5.3-java17-scala
+Tags: 3.5.4-scala2.12-java17-ubuntu, 3.5.4-java17-scala
 Architectures: amd64, arm64v8
-GitCommit: cf333e1f7403fa68c7b359cff77b7949ec0990b3
-Directory: 3.5.3/scala2.12-java17-ubuntu
+GitCommit: 6b917ced4279dd7b3a33a81a08db37b3f27e037b
+Directory: 3.5.4/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 f8a7017..bfb3095 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,22 +6,22 @@ spark:3.4.4-scala2.12-java11-python3-r-ubuntu
 spark:3.4.4-scala2.12-java11-python3-ubuntu
 spark:3.4.4-scala2.12-java11-r-ubuntu
 spark:3.4.4-scala2.12-java11-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:3.5.4
+spark:3.5.4-java17
+spark:3.5.4-java17-python3
+spark:3.5.4-java17-r
+spark:3.5.4-java17-scala
+spark:3.5.4-python3
+spark:3.5.4-r
+spark:3.5.4-scala
+spark:3.5.4-scala2.12-java11-python3-r-ubuntu
+spark:3.5.4-scala2.12-java11-python3-ubuntu
+spark:3.5.4-scala2.12-java11-r-ubuntu
+spark:3.5.4-scala2.12-java11-ubuntu
+spark:3.5.4-scala2.12-java17-python3-r-ubuntu
+spark:3.5.4-scala2.12-java17-python3-ubuntu
+spark:3.5.4-scala2.12-java17-r-ubuntu
+spark:3.5.4-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 3efd6c7..d99b479 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,7 +1,7 @@
 spark:3.4.4-scala
 spark:3.4.4-scala2.12-java11-python3-r-ubuntu
-spark:3.5.3-java17-scala
-spark:3.5.3-scala2.12-java17-python3-r-ubuntu
+spark:3.5.4-java17-scala
+spark:3.5.4-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.4
 spark:3.4.4-r
-spark:3.5.3-java17-r
-spark:3.5.3-scala2.12-java11-python3-r-ubuntu
+spark:3.5.4-java17-r
+spark:3.5.4-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.3-java17-r/Dockerfile b/spark_3.5.4-java17-r/Dockerfile
similarity index 95%
rename from spark_3.5.3-java17-r/Dockerfile
rename to spark_3.5.4-java17-r/Dockerfile
index 171fa66..0d42b81 100644
--- a/spark_3.5.3-java17-r/Dockerfile
+++ b/spark_3.5.4-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.3-scala2.12-java17-ubuntu
+FROM spark:3.5.4-scala2.12-java17-ubuntu
 
 USER root
 
diff --git a/spark_3.5.3-java17-scala/Dockerfile b/spark_3.5.4-java17-scala/Dockerfile
similarity index 95%
rename from spark_3.5.3-java17-scala/Dockerfile
rename to spark_3.5.4-java17-scala/Dockerfile
index bbe1fe7..4125654 100644
--- a/spark_3.5.3-java17-scala/Dockerfile
+++ b/spark_3.5.4-java17-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.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
+ENV SPARK_TGZ_URL=https://archive.apache.org/dist/spark/spark-3.5.4/spark-3.5.4-bin-hadoop3.tgz \
+    SPARK_TGZ_ASC_URL=https://archive.apache.org/dist/spark/spark-3.5.4/spark-3.5.4-bin-hadoop3.tgz.asc \
+    GPG_KEY=19F745C40A0E550420BB2C522541488DA93FE4B4
 
 RUN set -ex; \
     export SPARK_TMP="$(mktemp -d)"; \
diff --git a/spark_3.5.3-java17-scala/entrypoint.sh b/spark_3.5.4-java17-scala/entrypoint.sh
similarity index 100%
rename from spark_3.5.3-java17-scala/entrypoint.sh
rename to spark_3.5.4-java17-scala/entrypoint.sh
diff --git a/spark_3.5.3-scala2.12-java17-python3-r-ubuntu/Dockerfile b/spark_3.5.4-scala2.12-java11-python3-r-ubuntu/Dockerfile
similarity index 96%
rename from spark_3.5.3-scala2.12-java17-python3-r-ubuntu/Dockerfile
rename to spark_3.5.4-scala2.12-java11-python3-r-ubuntu/Dockerfile
index b65c879..0778a40 100644
--- a/spark_3.5.3-scala2.12-java17-python3-r-ubuntu/Dockerfile
+++ b/spark_3.5.4-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.3-scala2.12-java17-ubuntu
+FROM spark:3.5.4-scala2.12-java11-ubuntu
 
 USER root
 
diff --git a/spark_3.5.3-scala2.12-java11-python3-r-ubuntu/Dockerfile b/spark_3.5.4-scala2.12-java17-python3-r-ubuntu/Dockerfile
similarity index 96%
rename from spark_3.5.3-scala2.12-java11-python3-r-ubuntu/Dockerfile
rename to spark_3.5.4-scala2.12-java17-python3-r-ubuntu/Dockerfile
index b7f4cc6..5113809 100644
--- a/spark_3.5.3-scala2.12-java11-python3-r-ubuntu/Dockerfile
+++ b/spark_3.5.4-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.3-scala2.12-java11-ubuntu
+FROM spark:3.5.4-scala2.12-java17-ubuntu
 
 USER root
 
diff --git a/spark_latest/Dockerfile b/spark_latest/Dockerfile
index 60b10b9..ddb7c57 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.3-scala2.12-java11-ubuntu
+FROM spark:3.5.4-scala2.12-java11-ubuntu
 
 USER root
 
diff --git a/spark_python3-java17/Dockerfile b/spark_python3-java17/Dockerfile
index f0e7d87..8a2cd5d 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.3-scala2.12-java17-ubuntu
+FROM spark:3.5.4-scala2.12-java17-ubuntu
 
 USER root
 
diff --git a/spark_r/Dockerfile b/spark_r/Dockerfile
index 3b76da8..c5da428 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.3-scala2.12-java11-ubuntu
+FROM spark:3.5.4-scala2.12-java11-ubuntu
 
 USER root
 
diff --git a/spark_scala/Dockerfile b/spark_scala/Dockerfile
index 903d732..b5d6a4a 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.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
+ENV SPARK_TGZ_URL=https://archive.apache.org/dist/spark/spark-3.5.4/spark-3.5.4-bin-hadoop3.tgz \
+    SPARK_TGZ_ASC_URL=https://archive.apache.org/dist/spark/spark-3.5.4/spark-3.5.4-bin-hadoop3.tgz.asc \
+    GPG_KEY=19F745C40A0E550420BB2C522541488DA93FE4B4
 
 RUN set -ex; \
     export SPARK_TMP="$(mktemp -d)"; \

Relevant Maintainers:

@LuciferYang
Copy link
Contributor Author

cc @tianon

@tianon tianon merged commit 2feb504 into docker-library:master Dec 24, 2024
10 checks passed
@LuciferYang
Copy link
Contributor Author

Thanks @tianon ~

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