Skip to content

Commit 6a8e57c

Browse files
author
Andrea Rosa
authored
Merge branch 'master' into dependabot/maven/integration-tests/funcs/flowAllFeatures/junit-junit-4.13.1
2 parents 08b34e7 + 806852a commit 6a8e57c

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

images/runtime/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ RUN addgroup --system --gid 1000 fn && adduser --uid 1000 --gid 1000 fn
3434
#
3535
# The max memory value obtained with these args seem to be okay for most memory limits. The exception is when the
3636
# memory limit is set to 128MiB, in which case maxMemory returns roughly half.
37-
ENTRYPOINT [ "java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-XX:-UsePerfData", "-XX:MaxRAMFraction=2", "-XX:+UseSerialGC", "-Xshare:on", "-Djava.library.path=/function/runtime/lib", "-cp", "/function/app/*:/function/runtime/*", "com.fnproject.fn.runtime.EntryPoint" ]
37+
ENTRYPOINT [ "java", "-XX:+UnlockExperimentalVMOptions", "-XX:+UseCGroupMemoryLimitForHeap", "-XX:-UsePerfData", "-XX:MaxRAMFraction=2", "-XX:+UseSerialGC", "-Xshare:on", "-Djava.library.path=/function/runtime/lib", "-cp", "/function/app/*:/function/runtime/*:/function/app:/function/app/resources", "com.fnproject.fn.runtime.EntryPoint" ]

images/runtime/Dockerfile-jre11

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,5 @@ RUN addgroup --system --gid 1000 fn && adduser --uid 1000 --gid 1000 fn
3232
ENTRYPOINT [ "/usr/local/openjdk-11/bin/java", "-XX:-UsePerfData", "-XX:+UseSerialGC", "-Xshare:on", \
3333
"-Djava.awt.headless=true" , \
3434
"-Djava.library.path=/function/runtime/lib", \
35-
"-cp", "/function/app/*:/function/runtime/*", \
35+
"-cp", "/function/app/*:/function/runtime/*:/function/app:/function/app/resources", \
3636
"com.fnproject.fn.runtime.EntryPoint" ]

release.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.116
1+
1.0.118

0 commit comments

Comments
 (0)