style: fix indents, typo
This commit is contained in:
parent
22af091235
commit
e6f50be0f5
SSH key fingerprint:
SHA256:SnH1iYY/ogxxRmt1I6piy+aVUUzrOWvfksQWfhZ8JUM
1 changed files with 22 additions and 25 deletions
|
|
@ -1,42 +1,42 @@
|
||||||
FROM ubuntu:25.04 AS build
|
FROM ubuntu:25.04 AS build
|
||||||
|
|
||||||
# partly copied from mkdocker.sh
|
# partially copied from mkdocker.sh
|
||||||
# Copyright IBM Corp (Eclipse Public License 2.0)
|
# Copyright IBM Corp (Eclipse Public License 2.0)
|
||||||
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 file gcc-14 g++-14 gdb git \
|
ant ant-contrib autoconf build-essential ca-certificates cmake cpio curl file gcc-14 g++-14 gdb 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 libfontconfig libfontconfig1-dev \
|
||||||
libfreetype6-dev libnuma-dev libssl-dev libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev libxtst-dev \
|
libfreetype6-dev libnuma-dev libssl-dev libx11-dev libxext-dev libxrandr-dev libxrender-dev libxt-dev libxtst-dev \
|
||||||
make nasm pkg-config python3 python3-dev rsync systemtap-sdt-dev unzip wget xvfb zip zlib1g-dev execstack unzip \
|
make nasm pkg-config python3 python3-dev rsync systemtap-sdt-dev unzip wget xvfb zip zlib1g-dev execstack unzip \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
WORKDIR /build
|
WORKDIR /build
|
||||||
RUN mkdir /build/bootjdk /build/dist \
|
RUN mkdir /build/bootjdk /build/dist \
|
||||||
&& wget --progress=dot:mega -O jdk21.tar.gz \
|
&& wget --progress=dot:mega -O jdk21.tar.gz \
|
||||||
https://api.adoptopenjdk.net/v3/binary/latest/21/ga/linux/x64/jdk/openj9/normal/adoptopenjdk \
|
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 \
|
&& tar -xzf jdk21.tar.gz --directory=/build/bootjdk --strip-components=1 \
|
||||||
&& rm -f jdk21.tar.gz
|
&& rm -f jdk21.tar.gz
|
||||||
|
|
||||||
RUN wget --progress=dot:mega -O jtreg.zip https://builds.shipilev.net/jtreg/jtreg-7.5.1%2B1.zip \
|
RUN wget --progress=dot:mega -O jtreg.zip https://builds.shipilev.net/jtreg/jtreg-7.5.1%2B1.zip \
|
||||||
&& unzip jtreg.zip -d /build \
|
&& unzip jtreg.zip -d /build \
|
||||||
&& rm -rf jtreg.zip
|
&& rm -rf jtreg.zip
|
||||||
|
|
||||||
ENV JT_HOME=/build/jtreg
|
ENV JT_HOME=/build/jtreg
|
||||||
|
|
||||||
RUN find /build/bootjdk -name '*.so' | xargs execstack -c
|
RUN find /build/bootjdk -name '*.so' | xargs 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 \
|
||||||
/build/src
|
/build/src
|
||||||
|
|
||||||
WORKDIR /build/src
|
WORKDIR /build/src
|
||||||
RUN bash get_source.sh
|
RUN bash get_source.sh
|
||||||
|
|
||||||
RUN bash configure \
|
RUN bash configure \
|
||||||
--enable-libffi-bundling --enable-ddr --enable-jitserver \
|
--enable-libffi-bundling --enable-ddr --enable-jitserver \
|
||||||
--enable-fallback-linker --with-jtreg=/build/jtreg --with-boot-jdk=/build/bootjdk \
|
--enable-fallback-linker --with-jtreg=/build/jtreg --with-boot-jdk=/build/bootjdk \
|
||||||
--with-openssl=system --with-extra-ldflags="-Wl,-z,noexecstack"
|
--with-openssl=system --with-extra-ldflags="-Wl,-z,noexecstack"
|
||||||
|
|
||||||
RUN make all JOBS=$(nproc)
|
RUN make all JOBS=$(nproc)
|
||||||
RUN make install
|
RUN make install
|
||||||
|
|
@ -44,8 +44,8 @@ RUN make install
|
||||||
# jlink by advice from https://adoptium.net/blog/2021/10/jlink-to-produce-own-runtime/
|
# jlink by advice from https://adoptium.net/blog/2021/10/jlink-to-produce-own-runtime/
|
||||||
WORKDIR /build/src/build/linux-x86_64-server-release/images
|
WORKDIR /build/src/build/linux-x86_64-server-release/images
|
||||||
RUN jdk/bin/jlink --strip-debug --no-man-pages --no-header-files --compress=2 \
|
RUN jdk/bin/jlink --strip-debug --no-man-pages --no-header-files --compress=2 \
|
||||||
--output jre \
|
--output jre \
|
||||||
--add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,\
|
--add-modules java.base,java.compiler,java.datatransfer,java.desktop,java.instrument,java.logging,\
|
||||||
java.management,java.management.rmi,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.se,\
|
java.management,java.management.rmi,java.naming,java.net.http,java.prefs,java.rmi,java.scripting,java.se,\
|
||||||
java.security.jgss,java.security.sasl,java.smartcardio,java.sql,java.sql.rowset,java.transaction.xa,\
|
java.security.jgss,java.security.sasl,java.smartcardio,java.sql,java.sql.rowset,java.transaction.xa,\
|
||||||
java.xml,java.xml.crypto,jdk.accessibility,jdk.charsets,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.dynalink,\
|
java.xml,java.xml.crypto,jdk.accessibility,jdk.charsets,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.dynalink,\
|
||||||
|
|
@ -54,8 +54,6 @@ jdk.nio.mapmode,jdk.random,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsu
|
||||||
jdk.xml.dom,jdk.zipfs,openj9.criu,openj9.cuda,openj9.dataaccess,openj9.gpu,openj9.jvm,\
|
jdk.xml.dom,jdk.zipfs,openj9.criu,openj9.cuda,openj9.dataaccess,openj9.gpu,openj9.jvm,\
|
||||||
openj9.sharedclasses,openj9.zosconditionhandling
|
openj9.sharedclasses,openj9.zosconditionhandling
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ENV JAVA_HOME=/build/src/build/linux-x86_64-server-release/images/jre
|
ENV JAVA_HOME=/build/src/build/linux-x86_64-server-release/images/jre
|
||||||
ENV PATH="$JAVA_HOME/bin:$JAVA_HOME/lib:$PATH"
|
ENV PATH="$JAVA_HOME/bin:$JAVA_HOME/lib:$PATH"
|
||||||
ENV TEST_JDK_HOME=/build/src/build/linux-x86_64-server-release/images/jdk
|
ENV TEST_JDK_HOME=/build/src/build/linux-x86_64-server-release/images/jdk
|
||||||
|
|
@ -64,7 +62,7 @@ ENV DIAGNOSTICLEVEL=nodetails
|
||||||
ENV NATIVE_TEST_LIBS=/build/src/build/linux-x86_64-server-release/images/test
|
ENV NATIVE_TEST_LIBS=/build/src/build/linux-x86_64-server-release/images/test
|
||||||
|
|
||||||
RUN cd /build/src/openj9/test \
|
RUN cd /build/src/openj9/test \
|
||||||
&& git clone https://github.com/adoptium/TKG.git
|
&& git clone https://github.com/adoptium/TKG.git
|
||||||
|
|
||||||
WORKDIR /build/src/openj9/test/TKG
|
WORKDIR /build/src/openj9/test/TKG
|
||||||
|
|
||||||
|
|
@ -84,7 +82,6 @@ RUN make -f parallelList.mk JOBS=$(nproc)
|
||||||
WORKDIR /build/src/build/linux-x86_64-server-release/images
|
WORKDIR /build/src/build/linux-x86_64-server-release/images
|
||||||
RUN mv ./* /build/dist/
|
RUN mv ./* /build/dist/
|
||||||
|
|
||||||
|
|
||||||
# ------
|
# ------
|
||||||
|
|
||||||
FROM ubuntu:25.04 AS run
|
FROM ubuntu:25.04 AS run
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue