Skip to content

Commit 0b797b3

Browse files
authored
Bump maven, Java, and PySpark to support Spark connect (#80)
1 parent 7f40e5c commit 0b797b3

7 files changed

Lines changed: 24 additions & 14 deletions

File tree

containers/conda_env/aarch64_test.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ dependencies:
2727
- llvmlite
2828
- loky>=3.5.1
2929
- pyarrow
30-
- pyspark>=3.4.0,<4.0
30+
# PySpark
31+
- pyspark>=4.0
32+
- grpcio
33+
- grpcio-status
34+
- googleapis-common-protos
35+
- zstandard
3136
- cloudpickle
3237
- pip:
3338
- awscli

containers/conda_env/linux_cpu_test.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ dependencies:
3535
- protobuf
3636
- cloudpickle
3737
- modin
38-
- pyspark>=3.4.0,<4.0
38+
# PySpark
39+
- pyspark>=4.0
40+
- grpcio
41+
- grpcio-status
42+
- googleapis-common-protos
43+
- zstandard
3944
- pip:
4045
- py-ubjson

containers/dockerfile/Dockerfile.cpu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ENV CC=gcc-10
1010
ENV CXX=g++-10
1111
ENV CPP=cpp-10
1212
ENV GOSU_VERSION=1.10
13-
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
13+
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64/
1414

1515
# Install all basic requirements
1616
RUN \
@@ -19,7 +19,7 @@ RUN \
1919
apt-get install -y software-properties-common && \
2020
add-apt-repository ppa:ubuntu-toolchain-r/test && \
2121
apt-get update && \
22-
apt-get install -y tar unzip wget git build-essential doxygen graphviz llvm libidn12 cmake ninja-build gcc-10 g++-10 openjdk-8-jdk-headless && \
22+
apt-get install -y tar unzip wget git build-essential doxygen graphviz llvm libidn12 cmake ninja-build gcc-10 g++-10 openjdk-17-jdk-headless && \
2323
# Miniforge
2424
wget -nv -O conda.sh https://github.com/conda-forge/miniforge/releases/download/$MINIFORGE_VERSION/Miniforge3-$MINIFORGE_VERSION-Linux-${ARCH}.sh && \
2525
bash conda.sh -b -p /opt/miniforge

containers/dockerfile/Dockerfile.gpu

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SHELL ["/bin/bash", "-c"]
1313
ENV DEBIAN_FRONTEND=noninteractive
1414
ENV PATH=/opt/miniforge/bin:$PATH
1515
ENV GOSU_VERSION=1.10
16-
ENV JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
16+
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64/
1717

1818
# Install all basic requirements
1919
RUN \
@@ -23,7 +23,7 @@ RUN \
2323
sed -i 's/ports.ubuntu.com/mirrors.ocf.berkeley.edu/g' /etc/apt/sources.list && \
2424
apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/${CUDA_REPO_ARCH}/3bf863cc.pub && \
2525
apt-get update && \
26-
apt-get install -y wget unzip bzip2 libgomp1 build-essential openjdk-8-jdk-headless && \
26+
apt-get install -y wget unzip bzip2 libgomp1 build-essential openjdk-17-jdk-headless && \
2727
apt-get install "libnccl2=${NCCL_VERSION}+cuda${CUDA_SHORT}" \
2828
"libnccl-dev=${NCCL_VERSION}+cuda${CUDA_SHORT}" -y --allow-change-held-packages && \
2929
# Miniforge
@@ -43,8 +43,8 @@ RUN \
4343
distributed \
4444
"dask-cuda=$RAPIDS_VERSION.*" "dask-cudf=$RAPIDS_VERSION.*" cupy \
4545
numpy pytest pytest-timeout scipy scikit-learn pandas matplotlib wheel \
46-
python-kubernetes urllib3 graphviz hypothesis "loky>=3.5.1" \
47-
"pyspark>=3.4.0,<4.0" cloudpickle cuda-python && \
46+
python-kubernetes urllib3 graphviz hypothesis "loky>=3.5.1" cuda-python \
47+
"pyspark>=4.0" grpcio grpcio-status googleapis-common-protos zstandard cloudpickle && \
4848
mamba clean --all --yes
4949

5050
# Install lightweight sudo (not bound to TTY)

containers/dockerfile/Dockerfile.i386

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ SHELL ["/bin/bash", "-c"]
55
ENV DEBIAN_FRONTEND=noninteractive
66
ENV GOSU_VERSION=1.10
77

8-
RUN apt-get update && \
9-
apt-get install -y tar unzip wget git build-essential ninja-build cmake curl
8+
RUN apt-get update && apt-get upgrade -y && \
9+
apt-get install -y tar unzip wget git build-essential ninja-build cmake curl ca-certificates
1010

1111
# Install lightweight sudo (not bound to TTY)
1212
RUN set -ex; \

containers/dockerfile/Dockerfile.jvm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
FROM rockylinux:8
22
ARG MINIFORGE_VERSION=24.9.2-0
33
ARG CMAKE_VERSION=3.31.2
4-
ARG MAVEN_VERSION=3.9.12
4+
ARG MAVEN_VERSION=3.9.14
55

66
SHELL ["/bin/bash", "-c"]
77

@@ -15,7 +15,7 @@ ENV GOSU_VERSION=1.10
1515
RUN dnf -y update && \
1616
dnf -y install dnf-plugins-core && \
1717
dnf config-manager --set-enabled powertools && \
18-
dnf install -y tar unzip make bzip2 wget xz git which ninja-build java-1.8.0-openjdk-devel \
18+
dnf install -y tar unzip make bzip2 wget xz git which ninja-build java-17-openjdk-devel \
1919
gcc-toolset-10-gcc gcc-toolset-10-binutils gcc-toolset-10-gcc-c++ \
2020
gcc-toolset-10-runtime gcc-toolset-10-libstdc++-devel && \
2121
# Miniforge

containers/dockerfile/Dockerfile.jvm_gpu_build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARG CUDA_VERSION
44
ARG NCCL_VERSION
55
ARG MINIFORGE_VERSION=24.9.2-0
66
ARG CMAKE_VERSION=3.31.2
7-
ARG MAVEN_VERSION=3.9.12
7+
ARG MAVEN_VERSION=3.9.14
88

99
SHELL ["/bin/bash", "-c"]
1010

@@ -21,7 +21,7 @@ RUN \
2121
dnf -y update && \
2222
dnf -y install dnf-plugins-core && \
2323
dnf config-manager --set-enabled powertools && \
24-
dnf install -y tar unzip wget xz git which ninja-build java-1.8.0-openjdk-devel gcc-toolset-10-gcc gcc-toolset-10-binutils gcc-toolset-10-gcc-c++ && \
24+
dnf install -y tar unzip wget xz git which ninja-build java-17-openjdk-devel gcc-toolset-10-gcc gcc-toolset-10-binutils gcc-toolset-10-gcc-c++ && \
2525
# Miniforge
2626
wget -nv -O conda.sh https://github.com/conda-forge/miniforge/releases/download/$MINIFORGE_VERSION/Miniforge3-$MINIFORGE_VERSION-Linux-x86_64.sh && \
2727
bash conda.sh -b -p /opt/miniforge && \

0 commit comments

Comments
 (0)