This is an automated email from the ASF dual-hosted git repository.
yangjie01 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 1d9905ab428 [SPARK-45276][INFRA] Replace Java 8 and Java 11 installed
in the Dockerfile with Java
1d9905ab428 is described below
commit 1d9905ab4289ab4407dd93487dd1f8f036938a59
Author: panbingkun <pbk1...@gmail.com>
AuthorDate: Fri Sep 29 09:16:05 2023 +0800
[SPARK-45276][INFRA] Replace Java 8 and Java 11 installed in the Dockerfile
with Java
### What changes were proposed in this pull request?
The pr aims to replace Java 8 and Java 11 installed in the Dockerfile,
include:
- dev/create-release/spark-rm/Dockerfile
- connector/docker/spark-test/base/Dockerfile
### Why are the changes needed?
After SPARK-44112, the minimum supported Java version for Apache Spark 4.0
is Java 17.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Manually test:
> 1.dev/create-release/spark-rm/Dockerfile
```
cd dev/create-release/spark-rm
docker build -t spark-rm --build-arg UID=$UID .
```
> 2. connector/docker/spark-test/base/Dockerfile
```
cd connector/docker
sh build
```
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #43076 from panbingkun/SPARK-45293.
Authored-by: panbingkun <pbk1...@gmail.com>
Signed-off-by: yangjie01 <yangji...@baidu.com>
---
connector/docker/spark-test/base/Dockerfile | 2 +-
dev/create-release/do-release-docker.sh | 2 +-
dev/create-release/spark-rm/Dockerfile | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/connector/docker/spark-test/base/Dockerfile
b/connector/docker/spark-test/base/Dockerfile
index d4a30c4681c..0e8593f8af5 100644
--- a/connector/docker/spark-test/base/Dockerfile
+++ b/connector/docker/spark-test/base/Dockerfile
@@ -22,7 +22,7 @@ FROM ubuntu:20.04
# Remove unneeded /var/lib/apt/lists/* after install to reduce the
# docker image size (by ~30MB)
RUN apt-get update && \
- apt-get install -y less openjdk-11-jre-headless iproute2 vim-tiny sudo
openssh-server && \
+ apt-get install -y less openjdk-17-jre-headless iproute2 vim-tiny sudo
openssh-server && \
rm -rf /var/lib/apt/lists/*
ENV SPARK_HOME /opt/spark
diff --git a/dev/create-release/do-release-docker.sh
b/dev/create-release/do-release-docker.sh
index 88398bc14dd..c44d0193069 100755
--- a/dev/create-release/do-release-docker.sh
+++ b/dev/create-release/do-release-docker.sh
@@ -45,7 +45,7 @@ Options are:
-n : dry run mode. Performs checks and local builds, but do not
upload anything.
-t [tag] : tag for the spark-rm docker image to use for building
(default: "latest").
-j [path] : path to local JDK installation to use for building. By default
the script will
- use openjdk8 installed in the docker image.
+ use openjdk17 installed in the docker image.
-s [step] : runs a single step of the process; valid steps are: tag,
build, docs, publish, finalize
EOF
}
diff --git a/dev/create-release/spark-rm/Dockerfile
b/dev/create-release/spark-rm/Dockerfile
index 85155b67bd5..50562e38fb5 100644
--- a/dev/create-release/spark-rm/Dockerfile
+++ b/dev/create-release/spark-rm/Dockerfile
@@ -61,9 +61,9 @@ RUN apt-get clean && apt-get update && $APT_INSTALL gnupg
ca-certificates && \
apt-get update && \
$APT_INSTALL software-properties-common && \
apt-get update && \
- # Install openjdk 8.
- $APT_INSTALL openjdk-8-jdk && \
- update-alternatives --set java $(ls
/usr/lib/jvm/java-8-openjdk-*/jre/bin/java) && \
+ # Install openjdk 17.
+ $APT_INSTALL openjdk-17-jdk && \
+ update-alternatives --set java $(ls /usr/lib/jvm/java-17-openjdk-*/bin/java)
&& \
# Install build / source control tools
$APT_INSTALL curl wget git maven ivy subversion make gcc lsof libffi-dev \
pandoc pandoc-citeproc libssl-dev libcurl4-openssl-dev libxml2-dev && \
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org
For additional commands, e-mail: commits-h...@spark.apache.org
