From a9775e99161ef16206c68309ba65535e0ccc2bce Mon Sep 17 00:00:00 2001 From: Harry Smith Date: Thu, 20 Jun 2019 15:15:29 +0100 Subject: [PATCH] Fix path of java binary in Dockerfile --- images/runtime/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/images/runtime/Dockerfile b/images/runtime/Dockerfile index 3aef82ba..bdad842f 100644 --- a/images/runtime/Dockerfile +++ b/images/runtime/Dockerfile @@ -1,8 +1,8 @@ -FROM openjdk:8-slim +FROM openjdk:8-jre-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"] +RUN ["java", "-Xshare:dump"] RUN addgroup --system --gid 1000 fn && adduser --uid 1000 --gid 1000 fn @@ -18,4 +18,4 @@ RUN addgroup --system --gid 1000 fn && adduser --uid 1000 --gid 1000 fn # # The max memory value obtained with these args seem to be okay for most memory limits. The exception is when the # memory limit is set to 128MiB, in which case maxMemory returns roughly half. -ENTRYPOINT [ "/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/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" ] +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" ]