yuanqiang
/
dk_cloud_drone
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

提交：单独

pull/1/head
袁强 4 months ago
parent
412f9e1d2d
commit
34aee08191
21 changed files with 59 additions and 59 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      dk-auth/Dockerfile
  2. 2
      dk-auth/src/main/resources/application.yml
  3. 2
      dk-common/common-sse/pom.xml
  4. 10
      dk-gateway/Dockerfile
  5. 4
      dk-gateway/src/main/resources/application.yml
  6. 6
      dk-modules/gen/Dockerfile
  7. 8
      dk-modules/job/Dockerfile
  8. 10
      dk-modules/resource/Dockerfile
  9. 2
      dk-modules/system/src/main/resources/application.yml
  10. 10
      dk-modules/workflow/Dockerfile
  11. 2
      dk-modules/workflow/src/main/resources/application.yml
  12. 6
      dk-visual/monitor/Dockerfile
  13. 2
      dk-visual/monitor/src/main/resources/application.yml
  14. 6
      dk-visual/nacos/Dockerfile
  15. 4
      dk-visual/nacos/src/main/resources/application.properties
  16. 8
      dk-visual/seata-server/Dockerfile
  17. 8
      dk-visual/sentinel-dashboard/Dockerfile
  18. 2
      dk-visual/sentinel-dashboard/src/main/resources/application.yml
  19. 6
      dk-visual/snailjob-server/Dockerfile
  20. 2
      dk-visual/snailjob-server/src/main/resources/application.yml
  21. 8
      pom.xml

10
dk-auth/Dockerfile
View File

@ -5,17 +5,17 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li" LABEL maintainer="Lion Li"
RUN mkdir -p /ruoyi/auth/logs \ RUN mkdir -p /dk/auth/logs \
/ruoyi/auth/temp \ /dk/auth/temp \
/ruoyi/skywalking/agent /dk/skywalking/agent
WORKDIR /ruoyi/auth WORKDIR /dk/auth
ENV SERVER_PORT=9210 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" ENV SERVER_PORT=9210 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE ${SERVER_PORT} EXPOSE ${SERVER_PORT}
ADD ./target/ruoyi-auth.jar ./app.jar ADD ./target/dk-auth.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \ ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
#-Dskywalking.agent.service_name=ruoyi-auth \ #-Dskywalking.agent.service_name=ruoyi-auth \

2
dk-auth/src/main/resources/application.yml
View File

@ -6,7 +6,7 @@ server:
spring: spring:
application: application:
# 应用名称 # 应用名称
name: dk-auth name: auth
profiles: profiles:
# 环境配置 # 环境配置
active: @profiles.active@ active: @profiles.active@

2
dk-common/common-sse/pom.xml
View File

@ -12,7 +12,7 @@
<artifactId>common-sse</artifactId> <artifactId>common-sse</artifactId>
<description> <description>
ruoyi-common-sse 模块 common-sse 模块
</description> </description>
<dependencies> <dependencies>

10
dk-gateway/Dockerfile
View File

@ -5,17 +5,17 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li" LABEL maintainer="Lion Li"
RUN mkdir -p /ruoyi/gateway/logs \ RUN mkdir -p /dk/gateway/logs \
/ruoyi/gateway/temp \ /dk/gateway/temp \
/ruoyi/skywalking/agent /dk/skywalking/agent
WORKDIR /ruoyi/gateway WORKDIR /dk/gateway
ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" ENV SERVER_PORT=8080 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE ${SERVER_PORT} EXPOSE ${SERVER_PORT}
ADD ./target/ruoyi-gateway.jar ./app.jar ADD ./target/dk-gateway.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \ ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
#-Dskywalking.agent.service_name=ruoyi-gateway \ #-Dskywalking.agent.service_name=ruoyi-gateway \

4
dk-gateway/src/main/resources/application.yml
View File

@ -1,6 +1,6 @@
# Tomcat # Tomcat
server: server:
port: 8080 port: 11100
servlet: servlet:
context-path: / context-path: /
@ -8,7 +8,7 @@ server:
spring: spring:
application: application:
# 应用名称 # 应用名称
name: dk-gateway name: gateway
profiles: profiles:
# 环境配置 # 环境配置
active: @profiles.active@ active: @profiles.active@

6
dk-modules/gen/Dockerfile
View File

@ -5,14 +5,14 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li" LABEL maintainer="Lion Li"
RUN mkdir -p /ruoyi/gen/logs RUN mkdir -p /dk/gen/logs
WORKDIR /ruoyi/gen WORKDIR /dk/gen
ENV SERVER_PORT=9202 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" ENV SERVER_PORT=9202 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE ${SERVER_PORT} EXPOSE ${SERVER_PORT}
ADD ./target/ruoyi-gen.jar ./app.jar ADD ./target/dk-gen.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} ${JAVA_OPTS} -jar app.jar ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} ${JAVA_OPTS} -jar app.jar

8
dk-modules/job/Dockerfile
View File

@ -5,9 +5,9 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li" LABEL maintainer="Lion Li"
RUN mkdir -p /ruoyi/job/logs \ RUN mkdir -p /dk/job/logs \
/ruoyi/job/temp \ /dk/job/temp \
/ruoyi/skywalking/agent /dk/skywalking/agent
WORKDIR /ruoyi/job WORKDIR /ruoyi/job
@ -15,7 +15,7 @@ ENV SERVER_PORT=9203 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE ${SERVER_PORT} EXPOSE ${SERVER_PORT}
ADD ./target/ruoyi-job.jar ./app.jar ADD ./target/dk-job.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \ ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
#-Dskywalking.agent.service_name=ruoyi-job \ #-Dskywalking.agent.service_name=ruoyi-job \

10
dk-modules/resource/Dockerfile
View File

@ -5,17 +5,17 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li" LABEL maintainer="Lion Li"
RUN mkdir -p /ruoyi/resource/logs \ RUN mkdir -p /dk/resource/logs \
/ruoyi/resource/temp \ /dk/resource/temp \
/ruoyi/skywalking/agent /dk/skywalking/agent
WORKDIR /ruoyi/resource WORKDIR /dk/resource
ENV SERVER_PORT=9204 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" ENV SERVER_PORT=9204 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE ${SERVER_PORT} EXPOSE ${SERVER_PORT}
ADD ./target/ruoyi-resource.jar ./app.jar ADD ./target/dk-resource.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \ ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
#-Dskywalking.agent.service_name=ruoyi-resource \ #-Dskywalking.agent.service_name=ruoyi-resource \

2
dk-modules/system/src/main/resources/application.yml
View File

@ -6,7 +6,7 @@ server:
spring: spring:
application: application:
# 应用名称 # 应用名称
name: dk-system name: system
profiles: profiles:
# 环境配置 # 环境配置
active: @profiles.active@ active: @profiles.active@

10
dk-modules/workflow/Dockerfile
View File

@ -5,17 +5,17 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li" LABEL maintainer="Lion Li"
RUN mkdir -p /ruoyi/workflow/logs \ RUN mkdir -p /dk/workflow/logs \
/ruoyi/workflow/temp \ /dk/workflow/temp \
/ruoyi/skywalking/agent /dk/skywalking/agent
WORKDIR /ruoyi/workflow WORKDIR /dk/workflow
ENV SERVER_PORT=9205 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" ENV SERVER_PORT=9205 LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE ${SERVER_PORT} EXPOSE ${SERVER_PORT}
ADD ./target/ruoyi-workflow.jar ./app.jar ADD ./target/dk-workflow.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \ ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom -Dserver.port=${SERVER_PORT} \
#-Dskywalking.agent.service_name=ruoyi-system \ #-Dskywalking.agent.service_name=ruoyi-system \

2
dk-modules/workflow/src/main/resources/application.yml
View File

@ -6,7 +6,7 @@ server:
spring: spring:
application: application:
# 应用名称 # 应用名称
name: dk-workflow name: workflow
profiles: profiles:
# 环境配置 # 环境配置
active: @profiles.active@ active: @profiles.active@

6
dk-visual/monitor/Dockerfile
View File

@ -5,15 +5,15 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li" LABEL maintainer="Lion Li"
RUN mkdir -p /ruoyi/monitor/logs RUN mkdir -p /dk/monitor/logs
WORKDIR /ruoyi/monitor WORKDIR /dk/monitor
ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE 9100 EXPOSE 9100
ADD ./target/ruoyi-monitor.jar ./app.jar ADD ./target/dk-monitor.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \ ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \
-XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \ -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \

2
dk-visual/monitor/src/main/resources/application.yml
View File

@ -6,7 +6,7 @@ server:
spring: spring:
application: application:
# 应用名称 # 应用名称
name: dk-monitor name: monitor
profiles: profiles:
# 环境配置 # 环境配置
active: @profiles.active@ active: @profiles.active@

6
dk-visual/nacos/Dockerfile
View File

@ -5,15 +5,15 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li" LABEL maintainer="Lion Li"
RUN mkdir -p /ruoyi/nacos RUN mkdir -p /dk/nacos
WORKDIR /ruoyi/nacos WORKDIR /dk/nacos
EXPOSE 8848 EXPOSE 8848
ENV TZ=Asia/Shanghai LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m" ENV TZ=Asia/Shanghai LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
ADD ./target/ruoyi-nacos.jar ./app.jar ADD ./target/dk-nacos.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom ${JAVA_OPTS} -jar app.jar ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom ${JAVA_OPTS} -jar app.jar

4
dk-visual/nacos/src/main/resources/application.properties
View File

@ -84,8 +84,8 @@ nacos.naming.empty-service.clean.period-time-ms=30000
#*************** Metrics Related Configurations ***************# #*************** Metrics Related Configurations ***************#
# 指向 ruoyi-monitor 监控 # 指向 ruoyi-monitor 监控
spring.boot.admin.client.url=http://127.0.0.1:9100 spring.boot.admin.client.url=http://114.235.183.173:9100
spring.boot.admin.client.username=ruoyi spring.boot.admin.client.username=admin
spring.boot.admin.client.password=123456 spring.boot.admin.client.password=123456
spring.boot.admin.client.instance.service-host-type=IP spring.boot.admin.client.instance.service-host-type=IP
spring.boot.admin.client.instance.metadata.username: ${spring.boot.admin.client.username} spring.boot.admin.client.instance.metadata.username: ${spring.boot.admin.client.username}

8
dk-visual/seata-server/Dockerfile
View File

@ -5,10 +5,10 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li" LABEL maintainer="Lion Li"
RUN mkdir -p /ruoyi/seata-server/logs \ RUN mkdir -p /dk/seata-server/logs \
/ruoyi/skywalking/agent /dk/skywalking/agent
WORKDIR /ruoyi/seata-server WORKDIR /dk/seata-server
ENV TZ=PRC LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" SEATA_IP="" SEATA_PORT="" ENV TZ=PRC LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" SEATA_IP="" SEATA_PORT=""
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@ -16,7 +16,7 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
EXPOSE 7091 EXPOSE 7091
EXPOSE 8091 EXPOSE 8091
ADD ./target/ruoyi-seata-server.jar ./app.jar ADD ./target/dk-seata-server.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \ ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \
#-Dskywalking.agent.service_name=ruoyi-seata-server", \ #-Dskywalking.agent.service_name=ruoyi-seata-server", \

8
dk-visual/sentinel-dashboard/Dockerfile
View File

@ -5,16 +5,16 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li" LABEL maintainer="Lion Li"
RUN mkdir -p /ruoyi/sentinel-dashboard/logs \ RUN mkdir -p /dk/sentinel-dashboard/logs \
/ruoyi/skywalking/agent /dk/skywalking/agent
WORKDIR /ruoyi/sentinel-dashboard WORKDIR /dk/sentinel-dashboard
ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="" ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS=""
EXPOSE 8718 EXPOSE 8718
ADD ./target/ruoyi-sentinel-dashboard.jar ./app.jar ADD ./target/dk-sentinel-dashboard.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \ ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \
#-Dskywalking.agent.service_name=ruoyi-sentinel-dashboard \ #-Dskywalking.agent.service_name=ruoyi-sentinel-dashboard \

2
dk-visual/sentinel-dashboard/src/main/resources/application.yml
View File

@ -6,7 +6,7 @@ server:
spring: spring:
application: application:
# 应用名称 # 应用名称
name: dk-sentinel-dashboard name: sentinel-dashboard
profiles: profiles:
# 环境配置 # 环境配置
active: @profiles.active@ active: @profiles.active@

6
dk-visual/snailjob-server/Dockerfile
View File

@ -5,16 +5,16 @@ FROM bellsoft/liberica-openjdk-debian:17.0.11-cds
LABEL maintainer="Lion Li" LABEL maintainer="Lion Li"
RUN mkdir -p /ruoyi/snailjob/logs RUN mkdir -p /dk/snailjob/logs
WORKDIR /ruoyi/snailjob WORKDIR /dk/snailjob
ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m" ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 JAVA_OPTS="-Xms512m -Xmx1024m"
EXPOSE 8800 EXPOSE 8800
EXPOSE 17888 EXPOSE 17888
ADD ./target/ruoyi-snailjob-server.jar ./app.jar ADD ./target/dk-snailjob-server.jar ./app.jar
ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \ ENTRYPOINT java -Djava.security.egd=file:/dev/./urandom \
-XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \ -XX:+HeapDumpOnOutOfMemoryError -XX:+UseZGC ${JAVA_OPTS} \

2
dk-visual/snailjob-server/src/main/resources/application.yml
View File

@ -5,7 +5,7 @@ server:
spring: spring:
application: application:
name: dk-snailjob-server name: snailjob-server
profiles: profiles:
active: @profiles.active@ active: @profiles.active@
web: web:

8
pom.xml
View File

@ -78,12 +78,12 @@
<properties> <properties>
<!-- 环境标识，需要与配置文件的名称相对应 --> <!-- 环境标识，需要与配置文件的名称相对应 -->
<profiles.active>dev</profiles.active> <profiles.active>dev</profiles.active>
<nacos.server>127.0.0.1:8848</nacos.server> <nacos.server>114.235.183.147:8848</nacos.server>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group> <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group> <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
<nacos.username>nacos</nacos.username> <nacos.username>nacos</nacos.username>
<nacos.password>nacos</nacos.password> <nacos.password>nacos</nacos.password>
<logstash.address>127.0.0.1:4560</logstash.address> <logstash.address>114.235.183.147:4560</logstash.address>
</properties> </properties>
<activation> <activation>
<!-- 默认环境 --> <!-- 默认环境 -->
@ -94,12 +94,12 @@
<id>prod</id> <id>prod</id>
<properties> <properties>
<profiles.active>prod</profiles.active> <profiles.active>prod</profiles.active>
<nacos.server>127.0.0.1:8848</nacos.server> <nacos.server>114.235.183.147:8848</nacos.server>
<nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group> <nacos.discovery.group>DEFAULT_GROUP</nacos.discovery.group>
<nacos.config.group>DEFAULT_GROUP</nacos.config.group> <nacos.config.group>DEFAULT_GROUP</nacos.config.group>
<nacos.username>nacos</nacos.username> <nacos.username>nacos</nacos.username>
<nacos.password>nacos</nacos.password> <nacos.password>nacos</nacos.password>
<logstash.address>127.0.0.1:4560</logstash.address> <logstash.address>114.235.183.147:4560</logstash.address>
</properties> </properties>
</profile> </profile>
</profiles> </profiles>

Write Preview
Loading…
Cancel
Save