Add jdk11 build/runtime images (#169)

* Add build for J11 images
* Remove JDK9 VM memory options

Author: rikgibson

README.md

@@ -2,7 +2,7 @@
 [![CircleCI](https://circleci.com/gh/fnproject/fdk-java.svg?style=svg&circle-token=348bec5610c34421f6c436ab8f6a18e153cb1c01)](https://circleci.com/gh/fnproject/fdk-java)
 
 This project adds support for writing functions in Java on the [Fn
-platform](https://github.com/fnproject/fn), with full support for Java 9
+platform](https://github.com/fnproject/fn), with full support for Java 11
 as the default out of the box.
 
 # FAQ
@@ -44,7 +44,7 @@ func.yaml created
 ```
 
 This creates the boilerplate for a new Java Function based on Maven and Oracle
-Java 9. The `pom.xml` includes a dependency on the latest version of the Fn
+Java 11. The `pom.xml` includes a dependency on the latest version of the Fn
 Java FDK that is useful for developing your Java functions.
 
 You can now import this project into your favourite IDE as normal.
@@ -101,7 +101,7 @@ You are now ready to run your Function locally using the Fn CLI tool.
 $ fn build
 Building image your_dockerhub_account/hello:0.0.1
 Sending build context to Docker daemon  14.34kB
-Step 1/11 : FROM fnproject/fn-java-fdk-build:jdk9-latest as build-stage
+Step 1/11 : FROM fnproject/fn-java-fdk-build:jdk11-latest as build-stage
  ---> 5435658a63ac
 Step 2/11 : WORKDIR /function
  ---> 37340c5aa451

build.sh

@@ -32,6 +32,7 @@ mvn  -B  deploy -DaltDeploymentRepository=localStagingDir::default::file://${REP
 (
   cd images/build
   ./docker-build.sh -f Dockerfile-jdk9 -t fnproject/fn-java-fdk-build:jdk9-${BUILD_VERSION} .
+  ./docker-build.sh -f Dockerfile-jdk11 -t fnproject/fn-java-fdk-build:jdk11-${BUILD_VERSION} .
 )
 
 (
@@ -42,6 +43,7 @@ mvn  -B  deploy -DaltDeploymentRepository=localStagingDir::default::file://${REP
 (
    cd runtime
    docker build -f ../images/runtime/Dockerfile-jdk9 -t fnproject/fn-java-fdk:jdk9-${BUILD_VERSION} .
+   docker build -f ../images/runtime/Dockerfile-jdk11 -t fnproject/fn-java-fdk:jdk11-${BUILD_VERSION} .
 )
 
 (
@@ -50,8 +52,7 @@ mvn  -B  deploy -DaltDeploymentRepository=localStagingDir::default::file://${REP
     ./docker-build.sh ${workdir}
 )
 
-
 (
     cd images/init-native
     ./docker-build.sh
-)
+)

images/build/Dockerfile-jdk11

@@ -0,0 +1,8 @@
+FROM maven:3-jdk-11-slim
+
+ARG FN_REPO_URL
+
+ADD pom.xml /tmp/cache-deps/pom.xml
+ADD cache-deps.sh /tmp/cache-deps/cache-deps.sh
+ADD src /tmp/cache-deps/src
+RUN /tmp/cache-deps/cache-deps.sh

images/runtime/Dockerfile-jdk11

@@ -0,0 +1,15 @@
+FROM openjdk:11-jdk-slim
+COPY target/runtime-*.jar target/dependency/*.jar /function/runtime/
+COPY src/main/c/libfnunixsocket.so /function/runtime/lib/
+
+RUN ["/usr/bin/java", "-Xshare:dump"]
+
+# The UseExeperimentalVMOptions, UseCGroupMemoryLimitForHeap and MaxRAMFraction options that were used in the JDK 9 builds are
+# no longer supported in JDK 11 - so these have been removed. We now rely on the built-in ContainerSupport option that Linux JDKs
+# use to configure themselves when detecting they are running in a container.
+#
+# SerialGC is used here as it's likely that we'll be running many JVMs on the same host machine and it's also likely
+# that the number of JVMs will outnumber the number of available processors.
+#
+ENTRYPOINT [ "/usr/bin/java", "-XX:-UsePerfData", "-XX:+UseSerialGC", "-Xshare:on", \
+     "-Djava.library.path=/function/runtime/lib", "-cp", "/function/app/*:/function/runtime/*", "com.fnproject.fn.runtime.EntryPoint" ]

integration-tests/README.md

@@ -34,7 +34,7 @@ and runtime images:
 ```
 cd runtime
 docker build -t fnproject/fn-java-fdk .
-docker build -f Dockerfile-jdk9 -t fnproject/fn-java-fdk:jdk9-latest .
+docker build -f Dockerfile-jdk11 -t fnproject/fn-java-fdk:jdk11-latest .
 ```
 
 Finally you can run the integration tests: