forked from DarkCat09/docker-openj9-piped
ci: update to ubuntu 25.04
This commit is contained in:
parent
6d0394056d
commit
d1c1980d67
1 changed files with 4 additions and 4 deletions
|
@ -1,11 +1,11 @@
|
||||||
FROM ubuntu:24.10 AS build
|
FROM ubuntu:25.04 AS build
|
||||||
|
|
||||||
# partly copied from mkdocker.sh
|
# partly copied from mkdocker.sh
|
||||||
# Copyright IBM Corp (Eclipse Public License 2.0)
|
# Copyright IBM Corp (Eclipse Public License 2.0)
|
||||||
RUN apt update \
|
RUN apt update \
|
||||||
&& apt upgrade -y \
|
&& apt upgrade -y \
|
||||||
&& apt install -qq -y --no-install-recommends \
|
&& apt install -qq -y --no-install-recommends \
|
||||||
ant ant-contrib autoconf build-essential ca-certificates cmake cpio curl file g++-13 gcc-13 gdb git \
|
ant ant-contrib autoconf build-essential ca-certificates cmake cpio curl file g++-14 gcc-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 \
|
make nasm pkg-config python3 python3-dev rsync systemtap-sdt-dev unzip wget xvfb zip zlib1g-dev \
|
||||||
|
@ -24,7 +24,7 @@ RUN git clone --single-branch --depth 1 \
|
||||||
|
|
||||||
WORKDIR /build/src
|
WORKDIR /build/src
|
||||||
RUN bash get_source.sh
|
RUN bash get_source.sh
|
||||||
RUN bash configure --with-boot-jdk=/build/bootjdk --with-mixedrefs=static --with-openssl=system
|
RUN bash configure --with-boot-jdk=/build/bootjdk --with-openssl=system
|
||||||
RUN make all
|
RUN make all
|
||||||
|
|
||||||
# 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/
|
||||||
|
@ -44,7 +44,7 @@ RUN mv ./* /build/dist/
|
||||||
|
|
||||||
# ------
|
# ------
|
||||||
|
|
||||||
FROM ubuntu:24.10 AS run
|
FROM ubuntu:25.04 AS run
|
||||||
|
|
||||||
COPY --from=build /build/dist/jre /usr/lib/jvm/openj9-jre
|
COPY --from=build /build/dist/jre /usr/lib/jvm/openj9-jre
|
||||||
ENV JAVA_HOME=/usr/lib/jvm/openj9-jre
|
ENV JAVA_HOME=/usr/lib/jvm/openj9-jre
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue