csantanapr closed pull request #24: Make AdoptOpenJDK Eclipse OpenJ9 the Java
runtime for Java actions
URL: https://github.com/apache/incubator-openwhisk-runtime-java/pull/24
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/core/javaAction/Dockerfile b/core/javaAction/Dockerfile
index 93add0f..e8f43a5 100644
--- a/core/javaAction/Dockerfile
+++ b/core/javaAction/Dockerfile
@@ -1,38 +1,23 @@
-FROM buildpack-deps:trusty-curl
+FROM adoptopenjdk/openjdk8-openj9:jdk8u162-b12_openj9-0.8.0
-ENV DEBIAN_FRONTEND noninteractive
+RUN rm -rf /var/lib/apt/lists/* && apt-get clean && apt-get update \
+ && apt-get install -y --no-install-recommends locales \
+ && rm -rf /var/lib/apt/lists/* \
+ && locale-gen en_US.UTF-8
-RUN locale-gen en_US.UTF-8
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
-ENV VERSION 8
-ENV UPDATE 131
-ENV BUILD 11
-
-ENV JAVA_HOME /usr/lib/jvm/java-${VERSION}-oracle
-ENV JRE_HOME ${JAVA_HOME}/jre
-
-RUN curl --silent --location --retry 3 --cacert
/etc/ssl/certs/GeoTrust_Global_CA.pem \
- --header "Cookie: oraclelicense=accept-securebackup-cookie;" \
-
http://download.oracle.com/otn-pub/java/jdk/"${VERSION}"u"${UPDATE}"-b"${BUILD}"/d54c1d3a095b4ff2b6607d096fa80163/server-jre-"${VERSION}"u"${UPDATE}"-linux-x64.tar.gz
\
- | tar xz -C /tmp && \
- mkdir -p /usr/lib/jvm && mv /tmp/jdk1.${VERSION}.0_${UPDATE} "${JAVA_HOME}"
&& \
- apt-get autoclean && apt-get --purge -y autoremove && \
- rm -rf /tmp/* /var/tmp/*
-
-RUN update-alternatives --install "/usr/bin/java" "java"
"${JRE_HOME}/bin/java" 1 && \
- update-alternatives --install "/usr/bin/javac" "javac"
"${JAVA_HOME}/bin/javac" 1 && \
- update-alternatives --set java "${JRE_HOME}/bin/java" && \
- update-alternatives --set javac "${JAVA_HOME}/bin/javac"
+ENV LANG="en_US.UTF-8" \
+ LANGUAGE="en_US:en" \
+ LC_ALL="en_US.UTF-8" \
+ VERSION=8 \
+ UPDATE=162 \
+ BUILD=12
ADD proxy /javaAction
-RUN rm -rf /javaAction/.classpath /javaAction/.gitignore /javaAction/.gradle
/javaAction/.project /javaAction/.settings /javaAction/Dockerfile
/javaAction/build
-
-RUN cd /javaAction; ./gradlew oneJar
-
-RUN rm -rf /javaAction/src
+RUN cd /javaAction \
+ && rm -rf .classpath .gitignore .gradle .project .settings Dockerfile
build \
+ && ./gradlew oneJar \
+ && rm -rf /javaAction/src \
+ && ./compileClassCache.sh
-CMD ["java", "-jar", "/javaAction/build/libs/javaAction-all.jar"]
+CMD ["java", "-Dfile.encoding=UTF-8",
"-Xshareclasses:cacheDir=/javaSharedCache,readonly", "-Xquickstart", "-jar",
"/javaAction/build/libs/javaAction-all.jar"]
diff --git a/core/javaAction/proxy/compileClassCache.sh
b/core/javaAction/proxy/compileClassCache.sh
new file mode 100755
index 0000000..bf1d4fa
--- /dev/null
+++ b/core/javaAction/proxy/compileClassCache.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+#### Construct Class Cache with HTTP Server classes by starting the server ####
+java "-Xshareclasses:cacheDir=/javaSharedCache/" "-Xquickstart" "-jar"
"/javaAction/build/libs/javaAction-all.jar" &
+HTTP_PID=$!
+sleep 2
+kill $HTTP_PID
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
