This is an automated email from the ASF dual-hosted git repository.

dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark-docker.git


The following commit(s) were added to refs/heads/master by this push:
     new daa6f94  [SPARK-49701] Use JDK for Spark 3.5+ Docker image
daa6f94 is described below

commit daa6f940a133d63a4e813bff811b98b1f05f1c4a
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Wed Sep 18 16:08:32 2024 -0700

    [SPARK-49701] Use JDK for Spark 3.5+ Docker image
    
    ### What changes were proposed in this pull request?
    
    This PR aims to use JDK for Spark 3.5+ Docker image. Apache Spark 
Dockerfile are updated already.
    - https://github.com/apache/spark/pull/45762
    - https://github.com/apache/spark/pull/45761
    
    ### Why are the changes needed?
    
    Since Apache Spark 3.5.0, SPARK-44153 starts to use `jmap` like the 
following.
    
    - https://github.com/apache/spark/pull/41709
    
    
https://github.com/apache/spark/blob/c832e2ac1d04668c77493577662c639785808657/core/src/main/scala/org/apache/spark/util/Utils.scala#L2030
    
    ### Does this PR introduce _any_ user-facing change?
    
    Yes, the user can use `Heap Histogram` feature.
    
    ### How was this patch tested?
    
    Pass the CIs.
    
    Closes #66 from dongjoon-hyun/SPARK-49701.
    
    Authored-by: Dongjoon Hyun <[email protected]>
    Signed-off-by: Dongjoon Hyun <[email protected]>
---
 3.5.0/scala2.12-java17-ubuntu/Dockerfile          | 2 +-
 3.5.1/scala2.12-java17-ubuntu/Dockerfile          | 2 +-
 3.5.2/scala2.12-java17-ubuntu/Dockerfile          | 2 +-
 4.0.0-preview1/scala2.13-java17-ubuntu/Dockerfile | 2 +-
 add-dockerfiles.sh                                | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/3.5.0/scala2.12-java17-ubuntu/Dockerfile 
b/3.5.0/scala2.12-java17-ubuntu/Dockerfile
index ed29cba..a2749bb 100644
--- a/3.5.0/scala2.12-java17-ubuntu/Dockerfile
+++ b/3.5.0/scala2.12-java17-ubuntu/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
 
diff --git a/3.5.1/scala2.12-java17-ubuntu/Dockerfile 
b/3.5.1/scala2.12-java17-ubuntu/Dockerfile
index 562d938..1682e72 100644
--- a/3.5.1/scala2.12-java17-ubuntu/Dockerfile
+++ b/3.5.1/scala2.12-java17-ubuntu/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
 
diff --git a/3.5.2/scala2.12-java17-ubuntu/Dockerfile 
b/3.5.2/scala2.12-java17-ubuntu/Dockerfile
index 280bd0c..34b1214 100644
--- a/3.5.2/scala2.12-java17-ubuntu/Dockerfile
+++ b/3.5.2/scala2.12-java17-ubuntu/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
 
diff --git a/4.0.0-preview1/scala2.13-java17-ubuntu/Dockerfile 
b/4.0.0-preview1/scala2.13-java17-ubuntu/Dockerfile
index 1102caf..0a487dd 100644
--- a/4.0.0-preview1/scala2.13-java17-ubuntu/Dockerfile
+++ b/4.0.0-preview1/scala2.13-java17-ubuntu/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
 
diff --git a/add-dockerfiles.sh b/add-dockerfiles.sh
index 63f610c..ccc4ac1 100755
--- a/add-dockerfiles.sh
+++ b/add-dockerfiles.sh
@@ -72,7 +72,7 @@ for TAG in $TAGS; do
     fi
 
     if echo $TAG | grep -q "java17"; then
-        OPTS+=" --java-version 17 --image eclipse-temurin:17-jre-jammy"
+        OPTS+=" --java-version 17 --image eclipse-temurin:17-jammy"
     elif echo $TAG | grep -q "java11"; then
         OPTS+=" --java-version 11 --image eclipse-temurin:11-jre-focal"
     fi


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to