feat: replace custom bootjdk with ubuntu package

This commit is contained in:
DarkCat09 2025-03-14 17:32:06 +04:00
parent 04c4e3fece
commit 0a63082d3b
Signed by: DarkCat09
SSH key fingerprint: SHA256:SnH1iYY/ogxxRmt1I6piy+aVUUzrOWvfksQWfhZ8JUM

View file

@ -5,20 +5,15 @@ FROM ubuntu:25.04 AS build
RUN apt -qq update \ RUN apt -qq update \
&& apt -qq upgrade -y \ && apt -qq upgrade -y \
&& apt -qq install -y --no-install-recommends \ && apt -qq install -y --no-install-recommends \
ant ant-contrib autoconf build-essential ca-certificates cmake cpio curl execstack file gcc g++ git \ ant ant-contrib autoconf ca-certificates cmake cpio file gcc g++ git \
libasound2-dev libcups2-dev libdwarf-dev libelf-dev libexpat1-dev libffi-dev libfontconfig libfontconfig1-dev \ libasound2-dev libcups2-dev libdwarf-dev libelf-dev libexpat1-dev libffi-dev \
libfreetype6-dev libnuma-dev libssl-dev libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev libxtst-dev \ libfontconfig libfontconfig1-dev libfreetype6-dev libnuma-dev libssl-dev \
make nasm pkg-config python3 python3-dev rsync systemtap-sdt-dev unzip wget xvfb zip zlib1g-dev unzip \ libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev libxtst-dev \
make nasm openjdk-21-jdk-headless pkg-config python3 python3-dev rsync \
systemtap-sdt-dev xvfb zlib1g-dev \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
WORKDIR /build WORKDIR /build
RUN mkdir /build/bootjdk /build/dist \
&& wget --progress=dot:mega -O jdk21.tar.gz \
https://api.adoptopenjdk.net/v3/binary/latest/21/ga/linux/x64/jdk/openj9/normal/adoptopenjdk \
&& tar -xzf jdk21.tar.gz --directory=/build/bootjdk --strip-components=1 \
&& rm -f jdk21.tar.gz
RUN find /build/bootjdk -name '*.so' -type f -print0 | xargs -0 -- execstack -c
RUN git clone --single-branch --depth 1 \ RUN git clone --single-branch --depth 1 \
https://github.com/ibmruntimes/openj9-openjdk-jdk21.git \ https://github.com/ibmruntimes/openj9-openjdk-jdk21.git \
@ -32,7 +27,7 @@ ENV CC=/usr/bin/gcc CXX=/usr/bin/g++
# CFLAGS="-O3 -flto -fwhole-program-vtables" \ # CFLAGS="-O3 -flto -fwhole-program-vtables" \
# LDFLAGS="-Wl,-O1" # LDFLAGS="-Wl,-O1"
RUN bash configure \ RUN bash configure \
--with-boot-jdk=/build/bootjdk \ --with-boot-jdk=/usr/lib/jvm/java-21-openjdk-amd64 \
--with-openssl=system --with-openssl=system
RUN make all JOBS=$(nproc) RUN make all JOBS=$(nproc)