Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions images/build-native/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ FROM openjdk:8-jdk-slim as build
LABEL maintainer="tomas.zezula@oracle.com"

RUN set -x \
&& mkdir /usr/share/man/man1 \
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Required to workaround a Debian issue: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Worth noting that I think openjdk docker images are now RHEL based not debian so this may crop up new issues.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@zootalures Those images are still Debian-based I think but pulling the actual OpenJDK build from the upstream jdk8u and jdk11u project builds, rather than from the Debian repos

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the jdk8 shouldn't be taken from the Debian repo I can download the JVMCI enabled JDK from https://github.com/graalvm/openjdk8-jvmci-builder/releases and save some time needed to build it from the openJDK.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ugg need to fix that damn flappy UDS test - re-running build.

&& apt-get -y update \
&& apt-get -y install gcc g++ git make openjdk-8-doc openjdk-8-source python zlib1g-dev \
&& rm -rf /var/lib/apt/lists/*

ENV JVMCI_VERSION 0.49
ENV JVMCI_VERSION 19-b04

WORKDIR /build

Expand All @@ -20,7 +21,7 @@ RUN set -x \
&& cp -r $(/build/mx/mx --primary-suite graal-jvmci-8 jdkhome) /build/jvmcijdk8

RUN git clone https://github.com/oracle/graal.git \
&& git -C graal checkout vm-1.0.0-rc11
&& git -C graal checkout vm-19.0.2
WORKDIR /build/graal/vm
RUN export JAVA_HOME=/build/jvmcijdk8 \
&& /build/mx/mx --dy /substratevm --force-bash-launchers=true --disable-polyglot --disable-libpolyglot build
Expand Down
2 changes: 1 addition & 1 deletion images/build-native/native.version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.3.0
0.4.0
4 changes: 3 additions & 1 deletion images/init-native/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ COPY --from=build /function/src/main/conf/reflection.json reflection.json
COPY --from=build /function/src/main/conf/jni.json jni.json
RUN /usr/local/graalvm/bin/native-image \
--static \
--delay-class-initialization-to-runtime=com.fnproject.fn.runtime.ntv.UnixSocketNative \
--no-fallback \
--initialize-at-build-time= \
--initialize-at-run-time=com.fnproject.fn.runtime.ntv.UnixSocketNative \
-H:Name=func \
-H:+ReportUnsupportedElementsAtRuntime \
-H:ReflectionConfigurationFiles=reflection.json \
Expand Down