[skywalking] branch update_docker_jdk created (now f5bfb0a)

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a change to branch update_docker_jdk
in repository https://gitbox.apache.org/repos/asf/skywalking.git.


      at f5bfb0a  update jdk 11 and remove unused java_opts.

This branch includes the following new commits:

     new f5bfb0a  update jdk 11 and remove unused java_opts.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[skywalking] 01/01: update jdk 11 and remove unused java_opts.

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tanjian pushed a commit to branch update_docker_jdk
in repository https://gitbox.apache.org/repos/asf/skywalking.git

commit f5bfb0a15cf600c9b54e41a5a22f592f9b2cdc74
Author: JaredTan95 <ji...@daocloud.io>
AuthorDate: Wed Aug 11 14:41:27 2021 +0800

    update jdk 11 and remove unused java_opts.
---
 CHANGES.md                      | 1 +
 docker/agent/Dockerfile.agent   | 2 +-
 docker/oap/Dockerfile.oap       | 2 +-
 docker/oap/docker-entrypoint.sh | 4 ----
 docker/ui/Dockerfile.ui         | 2 +-
 docker/ui/docker-entrypoint.sh  | 2 +-
 6 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 8f56653..f3eb8e2 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@ Release Notes.
 ------------------
 
 #### Project
+* Upgrade jdk 11 in dockerfile and remove unused java_opts.
 
 #### Java Agent
 
diff --git a/docker/agent/Dockerfile.agent b/docker/agent/Dockerfile.agent
index a3049c3..251490c 100644
--- a/docker/agent/Dockerfile.agent
+++ b/docker/agent/Dockerfile.agent
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG BASE_IMAGE='adoptopenjdk/openjdk8:alpine'
+ARG BASE_IMAGE='adoptopenjdk/openjdk11:alpine'
 
 FROM alpine as build
 
diff --git a/docker/oap/Dockerfile.oap b/docker/oap/Dockerfile.oap
index d496477..dd44a66 100644
--- a/docker/oap/Dockerfile.oap
+++ b/docker/oap/Dockerfile.oap
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG BASE_IMAGE='adoptopenjdk/openjdk8:alpine'
+ARG BASE_IMAGE='adoptopenjdk/openjdk11:alpine'
 
 FROM golang:1.14 AS cli
 
diff --git a/docker/oap/docker-entrypoint.sh b/docker/oap/docker-entrypoint.sh
index 827b45a..de60e3d 100755
--- a/docker/oap/docker-entrypoint.sh
+++ b/docker/oap/docker-entrypoint.sh
@@ -37,10 +37,6 @@ do
     CLASSPATH="$i:$CLASSPATH"
 done
 
-if java -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -version; then
-  JAVA_OPTS="${JAVA_OPTS} -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap"
-fi
-
 set -ex
 
 exec java ${JAVA_OPTS} -classpath ${CLASSPATH} org.apache.skywalking.oap.server.starter.OAPServerStartUp "$@"
diff --git a/docker/ui/Dockerfile.ui b/docker/ui/Dockerfile.ui
index d8003df..d2f9f54 100644
--- a/docker/ui/Dockerfile.ui
+++ b/docker/ui/Dockerfile.ui
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM adoptopenjdk/openjdk8:alpine
+FROM adoptopenjdk/openjdk11:alpine
 
 ENV DIST_NAME=apache-skywalking-apm-bin \
     JAVA_OPTS=" -Xms256M " \
diff --git a/docker/ui/docker-entrypoint.sh b/docker/ui/docker-entrypoint.sh
index 80b85b7..807bb71 100755
--- a/docker/ui/docker-entrypoint.sh
+++ b/docker/ui/docker-entrypoint.sh
@@ -28,4 +28,4 @@ if [[ ! -z "$SW_OAP_ADDRESS" ]]; then
   done
 fi
 
-exec java  ${JAVA_OPTS} -XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap -jar webapp/skywalking-webapp.jar "$@"
+exec java  ${JAVA_OPTS} -jar webapp/skywalking-webapp.jar "$@"