From 7521d92e3a3aa767336e460898d2f12c97d9e501 Mon Sep 17 00:00:00 2001 From: Falk Zoll Date: Tue, 6 Aug 2019 09:05:05 +0200 Subject: [PATCH] Update to new jdk base images. - Update core/java8 to adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u212-b04_openj9-0.14.2 This will add container awareness and will adjust the heap size of the JVM according to the memory limit the container has. - Update core/java8actionloop to adoptopenjdk/openjdk8:x86_64-ubuntu-jdk8u212-b04. --- core/java8/CHANGELOG.md | 5 +++++ core/java8/Dockerfile | 2 +- core/java8actionloop/Dockerfile | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/core/java8/CHANGELOG.md b/core/java8/CHANGELOG.md index 62cd6e0a..14ec1c7e 100644 --- a/core/java8/CHANGELOG.md +++ b/core/java8/CHANGELOG.md @@ -19,6 +19,11 @@ # Java 8 OpenWhisk Runtime Container +## 1.1.4 +Changes: +- Update jdk adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u212-b04_openj9-0.14.2 [jdk8u181-b13_openj9-0.9.0](https://hub.docker.com/r/adoptopenjdk/openjdk8-openj9/tags/) + Starting with [openj9-0.11.0}(https://github.com/eclipse/openj9/blob/b44844b02466ddf195eb9d8d6587ed89374a5f2a/doc/release-notes/0.11/0.11.md) container awareness is activated by default. This means, when the VM is running in a container, and a memory limit is set, the VM allocates more memory to the Java heap. Depending on the size of the memory limit. + ## 1.1.3 Changes: - Update jdk x86_64-ubuntu-jdk8u181-b13_openj9-0.9.0 and push latest hash [jdk8u181-b13_openj9-0.9.0](https://hub.docker.com/r/adoptopenjdk/openjdk8-openj9/tags/) [#77](https://github.com/apache/incubator-openwhisk-runtime-java/pull/77/files) diff --git a/core/java8/Dockerfile b/core/java8/Dockerfile index 34268691..abc0112f 100644 --- a/core/java8/Dockerfile +++ b/core/java8/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # -FROM adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u181-b13_openj9-0.9.0 +FROM adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u212-b04_openj9-0.14.2 RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update \ && apt-get install -y --no-install-recommends locales \ diff --git a/core/java8actionloop/Dockerfile b/core/java8actionloop/Dockerfile index 53b4f35b..a5a9e6cf 100644 --- a/core/java8actionloop/Dockerfile +++ b/core/java8actionloop/Dockerfile @@ -17,7 +17,7 @@ FROM golang:1.12 as builder RUN env CGO_ENABLED=0 go get github.com/apache/incubator-openwhisk-runtime-go/main -FROM adoptopenjdk/openjdk8:x86_64-ubuntu-jdk8u212-b03 +FROM adoptopenjdk/openjdk8:x86_64-ubuntu-jdk8u212-b04 RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update \ && apt-get install -y --no-install-recommends locales python vim \