diff --git a/build/docker/Dockerfile b/build/docker/Dockerfile index 21868cc8b15c9..7660325567748 100644 --- a/build/docker/Dockerfile +++ b/build/docker/Dockerfile @@ -24,15 +24,22 @@ RUN mkdir /pulsar RUN apt-get update && \ apt-get install -y software-properties-common && \ - add-apt-repository ppa:openjdk-r/ppa && \ apt-get update && \ apt-get install -y tig g++ cmake libssl-dev libcurl4-openssl-dev \ liblog4cxx-dev google-mock libgtest-dev \ libboost-dev libboost-program-options-dev libboost-system-dev libboost-python-dev \ - libxml2-utils wget \ - curl doxygen openjdk-17-jdk-headless clang-format \ + libxml2-utils wget apt-transport-https \ + curl doxygen clang-format \ gnupg2 golang-go zip unzip libzstd-dev libsnappy-dev wireshark-dev +# Install Eclipse Temurin Package +RUN mkdir -p /etc/apt/keyrings \ + && wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc \ + && echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list \ + && apt-get update \ + && apt-get -y dist-upgrade \ + && apt-get -y install temurin-17-jdk + # Compile and install gtest & gmock RUN cd /usr/src/googletest && \ cmake . && \ diff --git a/docker/pulsar/Dockerfile b/docker/pulsar/Dockerfile index 27fef14fb7628..f9dd4c93e22d7 100644 --- a/docker/pulsar/Dockerfile +++ b/docker/pulsar/Dockerfile @@ -58,10 +58,20 @@ RUN sed -i "s|http://archive\.ubuntu\.com/ubuntu/|${UBUNTU_MIRROR:-mirror://mirr && echo 'Acquire::http::Timeout "30";\nAcquire::ftp::Timeout "30";\nAcquire::Retries "3";' > /etc/apt/apt.conf.d/99timeout_and_retries \ && apt-get update \ && apt-get -y dist-upgrade \ - && apt-get -y install --no-install-recommends openjdk-17-jdk-headless netcat dnsutils less procps iputils-ping \ + && apt-get -y install --no-install-recommends netcat dnsutils less procps iputils-ping \ python3 python3-kazoo python3-pip \ - curl ca-certificates \ - && apt-get -y --purge autoremove \ + curl ca-certificates wget apt-transport-https + +# Install Eclipse Temurin Package +RUN mkdir -p /etc/apt/keyrings \ + && wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc \ + && echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list \ + && apt-get update \ + && apt-get -y dist-upgrade \ + && apt-get -y install temurin-17-jdk + +# Cleanup apt +RUN apt-get -y --purge autoremove \ && apt-get autoclean \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* @@ -76,8 +86,8 @@ RUN pip3 install pyyaml==5.4.1 # 4. /pulsar - hadoop writes to this directory RUN mkdir /pulsar && chmod g+w /pulsar -ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64 -RUN echo networkaddress.cache.ttl=1 >> /usr/lib/jvm/java-17-openjdk-amd64/conf/security/java.security +ENV JAVA_HOME /usr/lib/jvm/temurin-17-jdk-amd64 +RUN echo networkaddress.cache.ttl=1 >> /usr/lib/jvm/temurin-17-jdk-amd64/conf/security/java.security ADD target/python-client/ /pulsar/pulsar-client ENV PULSAR_ROOT_LOGGER=INFO,CONSOLE diff --git a/tests/docker-images/java-test-image/Dockerfile b/tests/docker-images/java-test-image/Dockerfile index b7f12b75968a1..8abae296f53de 100644 --- a/tests/docker-images/java-test-image/Dockerfile +++ b/tests/docker-images/java-test-image/Dockerfile @@ -38,10 +38,18 @@ ARG UBUNTU_MIRROR=mirror://mirrors.ubuntu.com/mirrors.txt RUN sed -i "s|http://archive\.ubuntu\.com/ubuntu/|${UBUNTU_MIRROR:-mirror://mirrors.ubuntu.com/mirrors.txt}|g" /etc/apt/sources.list \ && apt-get update \ && apt-get -y dist-upgrade \ - && apt-get -y install openjdk-17-jdk-headless + && apt-get -y install wget apt-transport-https -ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-amd64 -RUN echo networkaddress.cache.ttl=1 >> /usr/lib/jvm/java-17-openjdk-amd64/conf/security/java.security +# Install Eclipse Temurin Package +RUN mkdir -p /etc/apt/keyrings \ + && wget -O - https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc \ + && echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list \ + && apt-get update \ + && apt-get -y dist-upgrade \ + && apt-get -y install temurin-17-jdk + +ENV JAVA_HOME /usr/lib/jvm/temurin-17-jdk-amd64 +RUN echo networkaddress.cache.ttl=1 >> /usr/lib/jvm/temurin-17-jdk-amd64/conf/security/java.security # /pulsar/bin/watch-znode.py requires python3-kazoo # /pulsar/bin/pulsar-managed-ledger-admin requires python3-protobuf