From 0d4d2530a5b8cd30fda39b8bd84adf0ce6e26816 Mon Sep 17 00:00:00 2001 From: StrikeW Date: Thu, 30 May 2024 13:19:31 +0800 Subject: [PATCH] chore: upgrade to openjdk17 in dockerfile (#17013) --- ci/Dockerfile | 2 +- ci/scripts/release.sh | 2 +- docker/Dockerfile | 2 +- docker/Dockerfile.hdfs | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index 616af35fd118e..a1b6857a45c20 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -12,7 +12,7 @@ ENV LANG en_US.utf8 RUN sed -i 's|http://archive.ubuntu.com/ubuntu|http://us-east-2.ec2.archive.ubuntu.com/ubuntu/|g' /etc/apt/sources.list RUN apt-get update -yy && \ DEBIAN_FRONTEND=noninteractive apt-get -y install sudo make build-essential cmake protobuf-compiler curl parallel python3 python3-pip python3-venv software-properties-common \ - openssl libssl-dev libsasl2-dev libcurl4-openssl-dev pkg-config bash openjdk-11-jdk wget unzip git tmux lld postgresql-client kcat netcat-openbsd mysql-client \ + openssl libssl-dev libsasl2-dev libcurl4-openssl-dev pkg-config bash openjdk-17-jdk wget unzip git tmux lld postgresql-client kcat netcat-openbsd mysql-client \ maven zstd libzstd-dev locales \ python3.12 python3.12-dev \ && rm -rf /var/lib/{apt,dpkg,cache,log}/ diff --git a/ci/scripts/release.sh b/ci/scripts/release.sh index ee6479362f2ed..94fd38e2c9c75 100755 --- a/ci/scripts/release.sh +++ b/ci/scripts/release.sh @@ -23,7 +23,7 @@ echo "--- Install dependencies" dnf install -y perl-core wget python3 python3-devel cyrus-sasl-devel rsync openssl-devel echo "--- Install java and maven" -dnf install -y java-11-openjdk java-11-openjdk-devel +dnf install -y java-17-openjdk java-17-openjdk-devel pip3 install toml-cli wget https://rw-ci-deps-dist.s3.amazonaws.com/apache-maven-3.9.3-bin.tar.gz && tar -zxvf apache-maven-3.9.3-bin.tar.gz export PATH="${REPO_ROOT}/apache-maven-3.9.3/bin:$PATH" diff --git a/docker/Dockerfile b/docker/Dockerfile index 167815a988131..b4d2cf73ee85f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:24.04 AS base ENV LANG en_US.utf8 RUN apt-get update \ - && apt-get -y install ca-certificates build-essential libsasl2-dev openjdk-11-jdk software-properties-common python3.12 python3.12-dev openssl pkg-config + && apt-get -y install ca-certificates build-essential libsasl2-dev openjdk-17-jdk software-properties-common python3.12 python3.12-dev openssl pkg-config FROM base AS rust-base diff --git a/docker/Dockerfile.hdfs b/docker/Dockerfile.hdfs index 2e49564ccb570..b6eba07c421c0 100644 --- a/docker/Dockerfile.hdfs +++ b/docker/Dockerfile.hdfs @@ -3,7 +3,7 @@ FROM ubuntu:24.04 AS base ENV LANG en_US.utf8 RUN apt-get update \ - && apt-get -y install ca-certificates build-essential libsasl2-dev openjdk-11-jdk software-properties-common python3.12 python3.12-dev openssl pkg-config + && apt-get -y install ca-certificates build-essential libsasl2-dev openjdk-17-jdk software-properties-common python3.12 python3.12-dev openssl pkg-config FROM base AS dashboard-builder @@ -113,7 +113,7 @@ RUN cd /risingwave/java && mvn -B package -Dmaven.test.skip=true -Dno-build-rust tar -zxvf /risingwave/java/connector-node/assembly/target/risingwave-connector-1.0.0.tar.gz -C /risingwave/bin/connector-node FROM ubuntu:24.04 as image-base -RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install ca-certificates openjdk-11-jdk wget libsasl2-dev && rm -rf /var/lib/{apt,dpkg,cache,log}/ +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install ca-certificates openjdk-17-jdk wget libsasl2-dev && rm -rf /var/lib/{apt,dpkg,cache,log}/ FROM image-base as risingwave LABEL org.opencontainers.image.source https://github.com/risingwavelabs/risingwave