-
Notifications
You must be signed in to change notification settings - Fork 2.4k
Update spark 4.0.0-preview2 to spark 4.0.0 #19117
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
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Diff for 43419ae:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 58dd927..1aa7ea0 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -6,17 +6,17 @@ Architectures: amd64, arm64v8
GitCommit: 86f243f6df77cf247f8eb9931558d719e0c56144
Directory: 3.5.5/scala2.12-java11-python3-r-ubuntu
-Tags: 3.5.5-scala2.12-java11-python3-ubuntu, 3.5.5-python3, 3.5.5, python3, latest
+Tags: 3.5.5-scala2.12-java11-python3-ubuntu, 3.5.5-python3, 3.5.5
Architectures: amd64, arm64v8
GitCommit: 86f243f6df77cf247f8eb9931558d719e0c56144
Directory: 3.5.5/scala2.12-java11-python3-ubuntu
-Tags: 3.5.5-scala2.12-java11-r-ubuntu, 3.5.5-r, r
+Tags: 3.5.5-scala2.12-java11-r-ubuntu, 3.5.5-r
Architectures: amd64, arm64v8
GitCommit: 86f243f6df77cf247f8eb9931558d719e0c56144
Directory: 3.5.5/scala2.12-java11-r-ubuntu
-Tags: 3.5.5-scala2.12-java11-ubuntu, 3.5.5-scala, scala
+Tags: 3.5.5-scala2.12-java11-ubuntu, 3.5.5-scala
Architectures: amd64, arm64v8
GitCommit: 86f243f6df77cf247f8eb9931558d719e0c56144
Directory: 3.5.5/scala2.12-java11-ubuntu
@@ -26,7 +26,7 @@ Architectures: amd64, arm64v8
GitCommit: 86f243f6df77cf247f8eb9931558d719e0c56144
Directory: 3.5.5/scala2.12-java17-python3-r-ubuntu
-Tags: 3.5.5-scala2.12-java17-python3-ubuntu, 3.5.5-java17-python3, 3.5.5-java17, python3-java17
+Tags: 3.5.5-scala2.12-java17-python3-ubuntu, 3.5.5-java17-python3, 3.5.5-java17
Architectures: amd64, arm64v8
GitCommit: 86f243f6df77cf247f8eb9931558d719e0c56144
Directory: 3.5.5/scala2.12-java17-python3-ubuntu
@@ -41,42 +41,42 @@ Architectures: amd64, arm64v8
GitCommit: 86f243f6df77cf247f8eb9931558d719e0c56144
Directory: 3.5.5/scala2.12-java17-ubuntu
-Tags: 4.0.0-preview2-scala2.13-java17-python3-r-ubuntu
+Tags: 4.0.0-scala2.13-java17-python3-r-ubuntu
Architectures: amd64, arm64v8
-GitCommit: 059a2817e53ac7c0c408196f9eb91397a99ec84e
-Directory: 4.0.0-preview2/scala2.13-java17-python3-r-ubuntu
+GitCommit: 4bd1dbce94797b5b387b784db6b378069a8b6328
+Directory: 4.0.0/scala2.13-java17-python3-r-ubuntu
-Tags: 4.0.0-preview2-scala2.13-java17-python3-ubuntu, 4.0.0-preview2-python3, 4.0.0-preview2
+Tags: 4.0.0-scala2.13-java17-python3-ubuntu, 4.0.0-python3, 4.0.0, python3-java17
Architectures: amd64, arm64v8
-GitCommit: 059a2817e53ac7c0c408196f9eb91397a99ec84e
-Directory: 4.0.0-preview2/scala2.13-java17-python3-ubuntu
+GitCommit: 4bd1dbce94797b5b387b784db6b378069a8b6328
+Directory: 4.0.0/scala2.13-java17-python3-ubuntu
-Tags: 4.0.0-preview2-scala2.13-java17-r-ubuntu, 4.0.0-preview2-r
+Tags: 4.0.0-scala2.13-java17-r-ubuntu, 4.0.0-r, r
Architectures: amd64, arm64v8
-GitCommit: 059a2817e53ac7c0c408196f9eb91397a99ec84e
-Directory: 4.0.0-preview2/scala2.13-java17-r-ubuntu
+GitCommit: 4bd1dbce94797b5b387b784db6b378069a8b6328
+Directory: 4.0.0/scala2.13-java17-r-ubuntu
-Tags: 4.0.0-preview2-scala2.13-java17-ubuntu, 4.0.0-preview2-scala
+Tags: 4.0.0-scala2.13-java17-ubuntu, 4.0.0-scala, scala
Architectures: amd64, arm64v8
-GitCommit: 059a2817e53ac7c0c408196f9eb91397a99ec84e
-Directory: 4.0.0-preview2/scala2.13-java17-ubuntu
+GitCommit: 4bd1dbce94797b5b387b784db6b378069a8b6328
+Directory: 4.0.0/scala2.13-java17-ubuntu
-Tags: 4.0.0-preview2-scala2.13-java21-python3-r-ubuntu
+Tags: 4.0.0-scala2.13-java21-python3-r-ubuntu
Architectures: amd64, arm64v8
-GitCommit: 059a2817e53ac7c0c408196f9eb91397a99ec84e
-Directory: 4.0.0-preview2/scala2.13-java21-python3-r-ubuntu
+GitCommit: 4bd1dbce94797b5b387b784db6b378069a8b6328
+Directory: 4.0.0/scala2.13-java21-python3-r-ubuntu
-Tags: 4.0.0-preview2-scala2.13-java21-python3-ubuntu, 4.0.0-preview2-java21-python3, 4.0.0-preview2-java21
+Tags: 4.0.0-scala2.13-java21-python3-ubuntu, 4.0.0-java21-python3, 4.0.0-java21, python3, latest
Architectures: amd64, arm64v8
-GitCommit: 059a2817e53ac7c0c408196f9eb91397a99ec84e
-Directory: 4.0.0-preview2/scala2.13-java21-python3-ubuntu
+GitCommit: 4bd1dbce94797b5b387b784db6b378069a8b6328
+Directory: 4.0.0/scala2.13-java21-python3-ubuntu
-Tags: 4.0.0-preview2-scala2.13-java21-r-ubuntu, 4.0.0-preview2-java21-r
+Tags: 4.0.0-scala2.13-java21-r-ubuntu, 4.0.0-java21-r
Architectures: amd64, arm64v8
-GitCommit: 059a2817e53ac7c0c408196f9eb91397a99ec84e
-Directory: 4.0.0-preview2/scala2.13-java21-r-ubuntu
+GitCommit: 4bd1dbce94797b5b387b784db6b378069a8b6328
+Directory: 4.0.0/scala2.13-java21-r-ubuntu
-Tags: 4.0.0-preview2-scala2.13-java21-ubuntu, 4.0.0-preview2-java21-scala
+Tags: 4.0.0-scala2.13-java21-ubuntu, 4.0.0-java21-scala
Architectures: amd64, arm64v8
-GitCommit: 059a2817e53ac7c0c408196f9eb91397a99ec84e
-Directory: 4.0.0-preview2/scala2.13-java21-ubuntu
+GitCommit: 4bd1dbce94797b5b387b784db6b378069a8b6328
+Directory: 4.0.0/scala2.13-java21-ubuntu
diff --git a/_bashbrew-list b/_bashbrew-list
index 99b65f2..2e85a15 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -14,22 +14,22 @@ spark:3.5.5-scala2.12-java17-python3-r-ubuntu
spark:3.5.5-scala2.12-java17-python3-ubuntu
spark:3.5.5-scala2.12-java17-r-ubuntu
spark:3.5.5-scala2.12-java17-ubuntu
-spark:4.0.0-preview2
-spark:4.0.0-preview2-java21
-spark:4.0.0-preview2-java21-python3
-spark:4.0.0-preview2-java21-r
-spark:4.0.0-preview2-java21-scala
-spark:4.0.0-preview2-python3
-spark:4.0.0-preview2-r
-spark:4.0.0-preview2-scala
-spark:4.0.0-preview2-scala2.13-java17-python3-r-ubuntu
-spark:4.0.0-preview2-scala2.13-java17-python3-ubuntu
-spark:4.0.0-preview2-scala2.13-java17-r-ubuntu
-spark:4.0.0-preview2-scala2.13-java17-ubuntu
-spark:4.0.0-preview2-scala2.13-java21-python3-r-ubuntu
-spark:4.0.0-preview2-scala2.13-java21-python3-ubuntu
-spark:4.0.0-preview2-scala2.13-java21-r-ubuntu
-spark:4.0.0-preview2-scala2.13-java21-ubuntu
+spark:4.0.0
+spark:4.0.0-java21
+spark:4.0.0-java21-python3
+spark:4.0.0-java21-r
+spark:4.0.0-java21-scala
+spark:4.0.0-python3
+spark:4.0.0-r
+spark:4.0.0-scala
+spark:4.0.0-scala2.13-java17-python3-r-ubuntu
+spark:4.0.0-scala2.13-java17-python3-ubuntu
+spark:4.0.0-scala2.13-java17-r-ubuntu
+spark:4.0.0-scala2.13-java17-ubuntu
+spark:4.0.0-scala2.13-java21-python3-r-ubuntu
+spark:4.0.0-scala2.13-java21-python3-ubuntu
+spark:4.0.0-scala2.13-java21-r-ubuntu
+spark:4.0.0-scala2.13-java21-ubuntu
spark:latest
spark:python3
spark:python3-java17
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 65155be..7ec4e03 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,16 +1,16 @@
spark:3.5.5-java17-scala
+spark:3.5.5-scala
+spark:3.5.5-scala2.12-java11-python3-r-ubuntu
spark:3.5.5-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
-spark:4.0.0-preview2-scala2.13-java21-python3-r-ubuntu
-spark:python3-java17
+spark:4.0.0-java21-scala
+spark:4.0.0-scala2.13-java21-python3-r-ubuntu
+spark:latest
spark:scala
+spark:3.5.5
+spark:3.5.5-java17
spark:3.5.5-java17-r
-spark:3.5.5-scala2.12-java11-python3-r-ubuntu
-spark:4.0.0-preview2
-spark:4.0.0-preview2-java21
-spark:4.0.0-preview2-java21-r
-spark:4.0.0-preview2-r
-spark:latest
+spark:3.5.5-r
+spark:4.0.0-java21-r
+spark:4.0.0-scala2.13-java17-python3-r-ubuntu
+spark:python3-java17
spark:r
diff --git a/spark_python3-java17/Dockerfile b/spark_3.5.5-java17/Dockerfile
similarity index 100%
copy from spark_python3-java17/Dockerfile
copy to spark_3.5.5-java17/Dockerfile
diff --git a/spark_r/Dockerfile b/spark_3.5.5-r/Dockerfile
similarity index 100%
copy from spark_r/Dockerfile
copy to spark_3.5.5-r/Dockerfile
diff --git a/spark_scala/Dockerfile b/spark_3.5.5-scala/Dockerfile
similarity index 100%
copy from spark_scala/Dockerfile
copy to spark_3.5.5-scala/Dockerfile
diff --git a/spark_4.0.0-preview2-java21-scala/entrypoint.sh b/spark_3.5.5-scala/entrypoint.sh
similarity index 100%
rename from spark_4.0.0-preview2-java21-scala/entrypoint.sh
rename to spark_3.5.5-scala/entrypoint.sh
diff --git a/spark_latest/Dockerfile b/spark_3.5.5/Dockerfile
similarity index 100%
copy from spark_latest/Dockerfile
copy to spark_3.5.5/Dockerfile
diff --git a/spark_4.0.0-preview2-r/Dockerfile b/spark_4.0.0-java21-r/Dockerfile
similarity index 92%
rename from spark_4.0.0-preview2-r/Dockerfile
rename to spark_4.0.0-java21-r/Dockerfile
index e3185f3..833b000 100644
--- a/spark_4.0.0-preview2-r/Dockerfile
+++ b/spark_4.0.0-java21-r/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-FROM spark:4.0.0-preview2-scala2.13-java17-ubuntu
+FROM spark:4.0.0-scala2.13-java21-ubuntu
USER root
@@ -23,6 +23,6 @@ RUN set -ex; \
apt-get install -y r-base r-base-dev; \
rm -rf /var/lib/apt/lists/*
-ENV R_HOME /usr/lib/R
+ENV R_HOME=/usr/lib/R
USER spark
diff --git a/spark_4.0.0-preview2-java21-scala/Dockerfile b/spark_4.0.0-java21-scala/Dockerfile
similarity index 93%
rename from spark_4.0.0-preview2-java21-scala/Dockerfile
rename to spark_4.0.0-java21-scala/Dockerfile
index f2ec53d..33093f3 100644
--- a/spark_4.0.0-preview2-java21-scala/Dockerfile
+++ b/spark_4.0.0-java21-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-4.0.0-preview2/spark-4.0.0-preview2-bin-hadoop3.tgz \
- SPARK_TGZ_ASC_URL=https://archive.apache.org/dist/spark/spark-4.0.0-preview2/spark-4.0.0-preview2-bin-hadoop3.tgz.asc \
- GPG_KEY=F28C9C925C188C35E345614DEDA00CE834F0FC5C
+ENV SPARK_TGZ_URL=https://archive.apache.org/dist/spark/spark-4.0.0/spark-4.0.0-bin-hadoop3.tgz \
+ SPARK_TGZ_ASC_URL=https://archive.apache.org/dist/spark/spark-4.0.0/spark-4.0.0-bin-hadoop3.tgz.asc \
+ GPG_KEY=4DC9676CEF9A83E98FCA02784D6620843CD87F5A
RUN set -ex; \
export SPARK_TMP="$(mktemp -d)"; \
@@ -72,7 +72,7 @@ RUN set -ex; \
COPY entrypoint.sh /opt/
-ENV SPARK_HOME /opt/spark
+ENV SPARK_HOME=/opt/spark
WORKDIR /opt/spark/work-dir
diff --git a/spark_4.0.0-preview2-scala/entrypoint.sh b/spark_4.0.0-java21-scala/entrypoint.sh
similarity index 100%
rename from spark_4.0.0-preview2-scala/entrypoint.sh
rename to spark_4.0.0-java21-scala/entrypoint.sh
diff --git a/spark_4.0.0-preview2-java21-r/Dockerfile b/spark_4.0.0-preview2-java21-r/Dockerfile
deleted file mode 100644
index 1d77e12..0000000
diff --git a/spark_4.0.0-preview2-java21/Dockerfile b/spark_4.0.0-preview2-java21/Dockerfile
deleted file mode 100644
index c7155b0..0000000
diff --git a/spark_4.0.0-preview2-scala/Dockerfile b/spark_4.0.0-preview2-scala/Dockerfile
deleted file mode 100644
index 051acb3..0000000
diff --git a/spark_4.0.0-preview2/Dockerfile b/spark_4.0.0-preview2/Dockerfile
deleted file mode 100644
index 576fdaa..0000000
diff --git a/spark_4.0.0-preview2-scala2.13-java21-python3-r-ubuntu/Dockerfile b/spark_4.0.0-scala2.13-java17-python3-r-ubuntu/Dockerfile
similarity index 93%
rename from spark_4.0.0-preview2-scala2.13-java21-python3-r-ubuntu/Dockerfile
rename to spark_4.0.0-scala2.13-java17-python3-r-ubuntu/Dockerfile
index 99268f9..04e31a4 100644
--- a/spark_4.0.0-preview2-scala2.13-java21-python3-r-ubuntu/Dockerfile
+++ b/spark_4.0.0-scala2.13-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:4.0.0-preview2-scala2.13-java21-ubuntu
+FROM spark:4.0.0-scala2.13-java17-ubuntu
USER root
@@ -24,6 +24,6 @@ RUN set -ex; \
apt-get install -y r-base r-base-dev; \
rm -rf /var/lib/apt/lists/*
-ENV R_HOME /usr/lib/R
+ENV R_HOME=/usr/lib/R
USER spark
diff --git a/spark_4.0.0-preview2-scala2.13-java17-python3-r-ubuntu/Dockerfile b/spark_4.0.0-scala2.13-java21-python3-r-ubuntu/Dockerfile
similarity index 93%
rename from spark_4.0.0-preview2-scala2.13-java17-python3-r-ubuntu/Dockerfile
rename to spark_4.0.0-scala2.13-java21-python3-r-ubuntu/Dockerfile
index 7c575a8..ccfa156 100644
--- a/spark_4.0.0-preview2-scala2.13-java17-python3-r-ubuntu/Dockerfile
+++ b/spark_4.0.0-scala2.13-java21-python3-r-ubuntu/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-FROM spark:4.0.0-preview2-scala2.13-java17-ubuntu
+FROM spark:4.0.0-scala2.13-java21-ubuntu
USER root
@@ -24,6 +24,6 @@ RUN set -ex; \
apt-get install -y r-base r-base-dev; \
rm -rf /var/lib/apt/lists/*
-ENV R_HOME /usr/lib/R
+ENV R_HOME=/usr/lib/R
USER spark
diff --git a/spark_latest/Dockerfile b/spark_latest/Dockerfile
index 5c3033d..07eacc8 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.5-scala2.12-java11-ubuntu
+FROM spark:4.0.0-scala2.13-java21-ubuntu
USER root
diff --git a/spark_python3-java17/Dockerfile b/spark_python3-java17/Dockerfile
index d9fb2f4..6280300 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.5-scala2.12-java17-ubuntu
+FROM spark:4.0.0-scala2.13-java17-ubuntu
USER root
diff --git a/spark_r/Dockerfile b/spark_r/Dockerfile
index 7beaf3f..976e03c 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.5-scala2.12-java11-ubuntu
+FROM spark:4.0.0-scala2.13-java17-ubuntu
USER root
diff --git a/spark_scala/Dockerfile b/spark_scala/Dockerfile
index 2adc6a6..a94344f 100644
--- a/spark_scala/Dockerfile
+++ b/spark_scala/Dockerfile
@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-FROM eclipse-temurin:11-jre-focal
+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.5/spark-3.5.5-bin-hadoop3.tgz \
- SPARK_TGZ_ASC_URL=https://archive.apache.org/dist/spark/spark-3.5.5/spark-3.5.5-bin-hadoop3.tgz.asc \
- GPG_KEY=F28C9C925C188C35E345614DEDA00CE834F0FC5C
+ENV SPARK_TGZ_URL=https://archive.apache.org/dist/spark/spark-4.0.0/spark-4.0.0-bin-hadoop3.tgz \
+ SPARK_TGZ_ASC_URL=https://archive.apache.org/dist/spark/spark-4.0.0/spark-4.0.0-bin-hadoop3.tgz.asc \
+ GPG_KEY=4DC9676CEF9A83E98FCA02784D6620843CD87F5A
RUN set -ex; \
export SPARK_TMP="$(mktemp -d)"; \ Relevant Maintainers:
|
tianon
approved these changes
May 28, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.