This is an automated email from the ASF dual-hosted git repository.
mrutkowski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-runtime-java.git
The following commit(s) were added to refs/heads/master by this push:
new 6508577 Update to AdoptOpenJDK's JDK8-OpenJ9 Critical Patch Update
v0.15.1 (#98)
6508577 is described below
commit 65085770fa2441a88300d54a53568a4e5440f93f
Author: Matt Rutkowski <[email protected]>
AuthorDate: Mon Sep 9 08:31:01 2019 -0500
Update to AdoptOpenJDK's JDK8-OpenJ9 Critical Patch Update v0.15.1 (#98)
* Update to AdoptOpenJDK's JDK8-OpenJ9 Critical Patch Update v0.15.1
* ActionLoop requires tools.jar from Oracle JDK8
* Update UPDATE and BUILD env. vars.
* Actually use the JDK...
* put back old jdk for actionloop
* put back old jdk for actionloop
* Use AdoptOpen JDK8, OpenJ9 release version 0.15.1 for java8actionloop
---
core/java8/Dockerfile | 7 ++++---
core/java8actionloop/Dockerfile | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/core/java8/Dockerfile b/core/java8/Dockerfile
index abc0112..be41f27 100644
--- a/core/java8/Dockerfile
+++ b/core/java8/Dockerfile
@@ -15,7 +15,8 @@
# limitations under the License.
#
-FROM adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u212-b04_openj9-0.14.2
+# Use AdoptOpenJDK's JDK8, OpenJ9 Critical Patch Update (CPU) release version
0.15.1
+FROM adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u222-b10_openj9-0.15.1
RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update \
&& apt-get install -y --no-install-recommends locales \
@@ -26,8 +27,8 @@ ENV LANG="en_US.UTF-8" \
LANGUAGE="en_US:en" \
LC_ALL="en_US.UTF-8" \
VERSION=8 \
- UPDATE=162 \
- BUILD=12
+ UPDATE=222 \
+ BUILD=10
ADD proxy /javaAction
diff --git a/core/java8actionloop/Dockerfile b/core/java8actionloop/Dockerfile
index 83f5507..880f9dc 100644
--- a/core/java8actionloop/Dockerfile
+++ b/core/java8actionloop/Dockerfile
@@ -17,7 +17,8 @@
FROM golang:1.12 as builder
RUN env CGO_ENABLED=0 go get github.com/apache/openwhisk-runtime-go/main
-FROM adoptopenjdk/openjdk8:x86_64-ubuntu-jdk8u212-b04
+# Use AdoptOpen JDK8, OpenJ9 release version 0.15.1
+FROM adoptopenjdk/openjdk8-openj9:x86_64-ubuntu-jdk8u222-b10_openj9-0.15.1
RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update \
&& apt-get install -y --no-install-recommends locales python vim \
@@ -28,8 +29,8 @@ ENV LANG="en_US.UTF-8" \
LANGUAGE="en_US:en" \
LC_ALL="en_US.UTF-8" \
VERSION=8 \
- UPDATE=212 \
- BUILD=3
+ UPDATE=222 \
+ BUILD=10
RUN locale-gen en_US.UTF-8 ;\
mkdir -p /javaAction/action /usr/java/src /usr/java/lib
