From 93a1af99551b5e47173cf2953671e79a475a5672 Mon Sep 17 00:00:00 2001 From: David Delabassee Date: Wed, 9 Jan 2019 10:04:01 +0100 Subject: [PATCH 1/3] removed the (now) useless Docker & Format entries --- images/init-native/func.init.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/images/init-native/func.init.yaml b/images/init-native/func.init.yaml index b7b18322..e69de29b 100644 --- a/images/init-native/func.init.yaml +++ b/images/init-native/func.init.yaml @@ -1,2 +0,0 @@ -runtime: docker -format: http-stream From e913f61d6d76e312a619727c60cb40040ea449ee Mon Sep 17 00:00:00 2001 From: David Delabassee Date: Tue, 5 Feb 2019 12:29:27 +0000 Subject: [PATCH 2/3] Removed regeneration of CDS archive + no need to turn CDS on (on by default on 11) --- images/runtime/Dockerfile | 2 -- images/runtime/Dockerfile-jre11 | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/images/runtime/Dockerfile b/images/runtime/Dockerfile index e2fdc392..ba6c9fb1 100644 --- a/images/runtime/Dockerfile +++ b/images/runtime/Dockerfile @@ -2,8 +2,6 @@ FROM openjdk:8-slim COPY target/runtime-*.jar target/dependency/*.jar /function/runtime/ COPY src/main/c/libfnunixsocket.so /function/runtime/lib/ -RUN ["/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java", "-Xshare:dump"] - # UseCGroupMemoryLimitForHeap looks up /sys/fs/cgroup/memory/memory.limit_in_bytes inside the container to determine # what the heap should be set to. This is an experimental feature at the moment, thus we need to unlock to use it. # diff --git a/images/runtime/Dockerfile-jre11 b/images/runtime/Dockerfile-jre11 index 0574f914..2787755b 100644 --- a/images/runtime/Dockerfile-jre11 +++ b/images/runtime/Dockerfile-jre11 @@ -2,8 +2,6 @@ FROM openjdk:11-jre-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. @@ -11,5 +9,5 @@ RUN ["/usr/bin/java", "-Xshare:dump"] # 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", \ +ENTRYPOINT [ "/usr/bin/java", "-XX:-UsePerfData", "-XX:+UseSerialGC", \ "-Djava.library.path=/function/runtime/lib", "-cp", "/function/app/*:/function/runtime/*", "com.fnproject.fn.runtime.EntryPoint" ] From 7a7018d48307bf38585e05be32c3c0bda89f9a3c Mon Sep 17 00:00:00 2001 From: David Delabassee Date: Wed, 6 Feb 2019 08:36:31 +0000 Subject: [PATCH 3/3] Revert "removed the (now) useless Docker & Format entries" This reverts commit 93a1af99551b5e47173cf2953671e79a475a5672. --- images/init-native/func.init.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/init-native/func.init.yaml b/images/init-native/func.init.yaml index e69de29b..b7b18322 100644 --- a/images/init-native/func.init.yaml +++ b/images/init-native/func.init.yaml @@ -0,0 +1,2 @@ +runtime: docker +format: http-stream