diff --git a/ruoyi-admin/Dockerfile b/ruoyi-admin/Dockerfile index f792e6f20..6033f7e8c 100644 --- a/ruoyi-admin/Dockerfile +++ b/ruoyi-admin/Dockerfile @@ -3,7 +3,8 @@ FROM anapsix/alpine-java:8_server-jre_unlimited MAINTAINER Lion Li RUN mkdir -p /ruoyi/server/logs \ - /ruoyi/server/temp + /ruoyi/server/temp \ + /ruoyi/skywalking/agent WORKDIR /ruoyi/server @@ -13,4 +14,10 @@ EXPOSE ${SERVER_PORT} ADD ./target/ruoyi-admin.jar ./app.jar -ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dserver.port=${SERVER_PORT}","-jar", "app.jar"] +ENTRYPOINT ["java", \ + "-Djava.security.egd=file:/dev/./urandom", \ + "-Dserver.port=${SERVER_PORT}", \ + # 应用名称 如果想区分集群节点监控 改成不同的名称即可 +# "-Dskywalking.agent.service_name=ruoyi-server", \ +# "-javaagent:/ruoyi/skywalking/agent/skywalking-agent.jar", \ + "-jar", "app.jar"] diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index f966de0a3..80eb05ebe 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -84,6 +84,18 @@ test + + + + + + + + + + + + diff --git a/ruoyi-admin/src/main/resources/logback.xml b/ruoyi-admin/src/main/resources/logback.xml index 6851b17f1..40fa33b7c 100644 --- a/ruoyi-admin/src/main/resources/logback.xml +++ b/ruoyi-admin/src/main/resources/logback.xml @@ -97,12 +97,33 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 9668c1057..9cbb52717 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -109,6 +109,8 @@ services: volumes: # 配置文件 - /docker/server1/logs/:/ruoyi/server/logs/ + # skywalking 探针 +# - /docker/skywalking/agent/:/ruoyi/skywalking/agent privileged: true network_mode: "host" @@ -122,6 +124,8 @@ services: volumes: # 配置文件 - /docker/server2/logs/:/ruoyi/server/logs/ + # skywalking 探针 +# - /docker/skywalking/agent/:/ruoyi/skywalking/agent privileged: true network_mode: "host"