diff --git a/Dockerfile b/Dockerfile index ea109205b8aa5175d00c69ccd0f5370836fa8ea1..f9d4c0fab1d49c50da018a93f4fcc506aa057252 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,8 +10,14 @@ COPY --from=builder app/spring-boot-loader/ ./ COPY --from=builder app/snapshot-dependencies/ ./ COPY --from=builder app/application/ ./ +COPY build-script/entrypoint.sh entrypoint.sh + +RUN chmod +x /app/entrypoint.sh + ENV EXT_JVM_OPTS="${JAVA_OPTS}" +ENV PROFILE="${PROFILE}" + ENV JVM_OPTS="-javaagent:/opt/skywalking-agent/skywalking-agent.jar=agent.service_name=${APP_NAME},collector.backend_service=skywalking-oap-server.devops:11800\ -Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false\ -XX:MaxRAMPercentage=60 -XX:MaxMetaspaceSize=256m\ @@ -19,4 +25,4 @@ ENV JVM_OPTS="-javaagent:/opt/skywalking-agent/skywalking-agent.jar=agent.servic -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/data/heapdump/heapdump.hprof -XX:OnOutOfMemoryError=/app/dump-file-rollover.sh\ -XX:-OmitStackTraceInFastThrow -XX:+PrintCommandLineFlags" -ENTRYPOINT exec java $JVM_OPTS $EXT_JVM_OPTS org.springframework.boot.loader.JarLauncher --spring.profiles.active=${PROFILE} +ENTRYPOINT ["/app/entrypoint.sh"] diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 0000000000000000000000000000000000000000..e64db63aee74d25f172b8f5c04c2e57f8aaf3534 --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,6 @@ +#!/bin/bash +# Create the required directories +mkdir -p "/data/logs/gc" "/data/heapdump" + +# Start process +exec java $JVM_OPTS $EXT_JVM_OPTS org.springframework.boot.loader.JarLauncher --spring.profiles.active=$PROFILE diff --git a/k8s-deploy-template.yaml b/k8s-deploy-template.yaml index 32f5b4a4c0c9c0d6a4bcbd0b10ef7f4fb3cbfb8e..c1012f4295fbd35d11b4e7ee5a334fcfaa510caf 100644 --- a/k8s-deploy-template.yaml +++ b/k8s-deploy-template.yaml @@ -41,10 +41,6 @@ spec: - name: actuator containerPort: 1024 protocol: TCP - lifecycle: - postStart: - exec: - command: ["/bin/sh", "-c", "umask 0022 && mkdir -p /data/logs/gc /data/heapdump"] startupProbe: httpGet: scheme: HTTP