[skywalking] branch master updated: update jdk 11 in dockerfile and remove unused java_opts. (#7441)

[wu...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 3751388  update jdk 11 in dockerfile and remove unused java_opts. (#7441)
3751388 is described below

commit 375138887a599fefea449e4b46871ac416a0ecbe
Author: Jared Tan <ji...@daocloud.io>
AuthorDate: Wed Aug 11 19:27:25 2021 +0800

    update jdk 11 in dockerfile and remove unused java_opts. (#7441)
    
    * update jdk 11 and remove unused java_opts.
---
 CHANGES.md                      | 1 +
 docker/oap/Dockerfile.oap       | 2 +-
 docker/oap/docker-entrypoint.sh | 4 ----
 docker/ui/Dockerfile.ui         | 2 +-
 docker/ui/docker-entrypoint.sh  | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 27d5edd..a819d64 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/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 "$@"