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.

Sign up for GitHub

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

[SPARK-40256][BUILD][K8S] Switch base image from openjdk to eclipse-temurin #37705

Closed
wants to merge 1 commit into from
Closed

[SPARK-40256][BUILD][K8S] Switch base image from openjdk to eclipse-temurin #37705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/docker-image-tool.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,11 +269,11 @@ Examples:
$0 -r docker.io/myrepo -t v2.3.0 push

- Build and push Java11-based image with tag "v3.0.0" to docker.io/myrepo
$0 -r docker.io/myrepo -t v3.0.0 -b java_image_tag=11-jre-slim build
$0 -r docker.io/myrepo -t v3.0.0 -b java_image_tag=11-jre-focal build
$0 -r docker.io/myrepo -t v3.0.0 push

- Build and push Java11-based image for multiple archs to docker.io/myrepo
$0 -r docker.io/myrepo -t v3.0.0 -X -b java_image_tag=11-jre-slim build
$0 -r docker.io/myrepo -t v3.0.0 -X -b java_image_tag=11-jre-focal build
# Note: buildx, which does cross building, needs to do the push during build
# So there is no separate push step with -X

Expand Down
5 changes: 2 additions & 3 deletions resource-managers/kubernetes/docker/src/main/dockerfiles/spark/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
ARG java_image_tag=11-jre-slim
ARG java_image_tag=11-jre-focal

FROM openjdk:${java_image_tag}
FROM eclipse-temurin:${java_image_tag}

ARG spark_uid=185

Expand All @@ -28,7 +28,6 @@ ARG spark_uid=185
# docker build -t spark:latest -f kubernetes/dockerfiles/spark/Dockerfile .

RUN set -ex && \
sed -i 's/http:\/\/deb.\(.*\)/https:\/\/deb.\1/g' /etc/apt/sources.list && \
apt-get update && \
ln -s /lib /lib64 && \
apt install -y bash tini libc6 libpam-modules krb5-user libnss3 procps net-tools && \
Expand Down
2 changes: 1 addition & 1 deletion resource-managers/kubernetes/integration-tests/scripts/setup-integration-test-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ then
cd $SPARK_INPUT_DIR

if [[ $DOCKER_FILE == "N/A" ]]; then
# OpenJDK base-image tag (e.g. 8-jre-slim, 11-jre-slim)
# OpenJDK base-image tag (e.g. 8-jre-focal, 11-jre-focal)
JAVA_IMAGE_TAG_BUILD_ARG="-b java_image_tag=$JAVA_IMAGE_TAG"
else
if [[ $DOCKER_FILE = /* ]]; then
Expand Down