Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ci/docker/base.build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN <<EOF
set -euo pipefail

apt-get update -y
apt-get install -y -qq maven openjdk-8-jre openjdk-8-jdk
apt-get install -y -qq maven openjdk-17-jre openjdk-17-jdk

BUILD=1 ./ci/ci.sh init

Expand Down
2 changes: 1 addition & 1 deletion ci/docker/data.build.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ sudo rm -rf /var/lib/mongodb/mongod.lock
if [[ $RAY_CI_JAVA_BUILD == 1 ]]; then
# These packages increase the image size quite a bit, so we only install them
# as needed.
sudo apt-get install -y -qq maven openjdk-8-jre openjdk-8-jdk
sudo apt-get install -y -qq maven openjdk-17-jre openjdk-17-jdk
fi

EOF
2 changes: 1 addition & 1 deletion ci/docker/forge.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ curl -fsSL https://deb.nodesource.com/setup_18.x | bash -
apt-get update
apt-get install -y \
awscli docker-ce-cli nodejs build-essential python-is-python3 \
python3-pip openjdk-8-jre wget jq
python3-pip openjdk-17-jre wget jq

# As a convention, we pin all python packages to a specific version. This
# is to to make sure we can control version upgrades through code changes.
Expand Down
6 changes: 3 additions & 3 deletions ci/env/install-hdfs.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash

apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends openjdk-8-jdk net-tools curl netcat gnupg libsnappy-dev && rm -rf /var/lib/apt/lists/*
apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends openjdk-17-jdk net-tools curl netcat gnupg libsnappy-dev && rm -rf /var/lib/apt/lists/*

export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64/

curl -O https://dist.apache.org/repos/dist/release/hadoop/common/KEYS

Expand Down Expand Up @@ -39,7 +39,7 @@ chmod a+x entrypoint.sh

# Add JAVA_HOME env var to `/etc/hadoop/hadoop-env.sh`
# Probably would be better to refer to JAVA_HOME env var, but not sure about sed syntax.
sed -i "1s/^/JAVA_HOME=\/usr\/lib\/jvm\/java-8-openjdk-amd64\/\n/" $HADOOP_CONF_DIR/hadoop-env.sh
sed -i "1s/^/JAVA_HOME=\/usr\/lib\/jvm\/java-17-openjdk-amd64\/\n/" $HADOOP_CONF_DIR/hadoop-env.sh

# The following makes sure that ssh localhost should work without needing a password.
sudo apt-get update
Expand Down
2 changes: 1 addition & 1 deletion ci/env/install-java.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ set -euxo pipefail
SCRIPT_DIR=$(builtin cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd)
WORKSPACE_DIR="${SCRIPT_DIR}/../.."

sudo apt-get install -y maven openjdk-8-jre openjdk-8-jdk
sudo apt-get install -y maven openjdk-17-jre openjdk-17-jdk
"${WORKSPACE_DIR}"/java/build-jar-multiplatform.sh linux

# Pop caller's shell options (quietly)
Expand Down