kazusa
/
skywalking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update jdk 11 in dockerfile and remove unused java_opts. (#7441) 

* update jdk 11 and remove unused java_opts.
This commit is contained in:
Jared Tan 2021-08-11 19:27:25 +08:00 committed by GitHub
parent de6cae3429
commit 375138887a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -6,6 +6,7 @@ Release Notes.
------------------
#### Project
* Upgrade jdk 11 in dockerfile and remove unused java_opts.
#### Java Agent

2
docker/oap/Dockerfile.oap
View File

@ -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

4
docker/oap/docker-entrypoint.sh
View File

@ -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 "$@"

2
docker/ui/Dockerfile.ui
View File

@ -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 " \

2
docker/ui/docker-entrypoint.sh
View File

@ -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 "$@"