update 优化 docker 部署方式 使用 host 模式简化部署流程 降低使用成本

疯狂的狮子li

2022-07-11 6c1e146bc17c51ed744aa289b20febe339703196

update 优化 docker 部署方式 使用 host 模式简化部署流程 降低使用成本

 pom.xml

@@ -411,8 +411,6 @@
                <!-- çŽ¯å¢ƒæ ‡è¯†ï¼Œéœ€è¦ä¸Žé…ç½®æ–‡ä»¶çš„名称相对应 -->
                <profiles.active>local</profiles.active>
                <logging.level>debug</logging.level>
                <knife4j.production>false</knife4j.production>
                <endpoints.include>'*'</endpoints.include>
            </properties>
        </profile>
        <profile>
@@ -421,8 +419,6 @@
                <!-- çŽ¯å¢ƒæ ‡è¯†ï¼Œéœ€è¦ä¸Žé…ç½®æ–‡ä»¶çš„名称相对应 -->
                <profiles.active>dev</profiles.active>
                <logging.level>debug</logging.level>
                <knife4j.production>false</knife4j.production>
                <endpoints.include>'*'</endpoints.include>
            </properties>
            <activation>
                <!-- é»˜è®¤çŽ¯å¢ƒ -->
@@ -434,8 +430,6 @@
            <properties>
                <profiles.active>prod</profiles.active>
                <logging.level>warn</logging.level>
                <knife4j.production>true</knife4j.production>
                <endpoints.include>health, info, logfile</endpoints.include>
            </properties>
        </profile>
    </profiles>

 ruoyi-admin/Dockerfile

@@ -8,8 +8,10 @@

WORKDIR /ruoyi/server

EXPOSE 8080
ENV SERVER_PORT=8080

EXPOSE ${SERVER_PORT}

ADD ./target/ruoyi-admin.jar ./app.jar

ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dserver.port=${SERVER_PORT}","-jar", "app.jar"]

 ruoyi-admin/src/main/resources/application-prod.yml

@@ -5,7 +5,7 @@
spring.boot.admin.client:
  # å¢žåŠ å®¢æˆ·ç«¯å¼€å…³
  enabled: true
  url: http://172.30.0.90:9090/admin
  url: http://localhost:9090/admin
  instance:
    service-host-type: IP
  username: ruoyi
@@ -16,7 +16,7 @@
  # æ‰§è¡Œå™¨å¼€å…³
  enabled: true
  # è°ƒåº¦ä¸­å¿ƒåœ°å€ï¼šå¦‚调度中心集群部署存在多个地址则用逗号分隔。
  admin-addresses: http://172.30.0.92:9100/xxl-job-admin
  admin-addresses: http://localhost:9100/xxl-job-admin
  # æ‰§è¡Œå™¨é€šè®¯TOKEN：非空时启用
  access-token: xxl-job
  executor:
@@ -51,7 +51,7 @@
          driverClassName: com.mysql.cj.jdbc.Driver
          # jdbc æ‰€æœ‰å‚数配置参考 https://lionli.blog.csdn.net/article/details/122018562
          # rewriteBatchedStatements=true æ‰¹å¤„理优化 å¤§å¹…提升批量插入更新删除性能(对数据库有性能损耗 ä½¿ç”¨æ‰¹é‡æ“ä½œåº”考虑性能问题)
          url: jdbc:mysql://172.30.0.36:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
          username: root
          password: root
        # ä»Žåº“数据源
@@ -63,19 +63,19 @@
          password:
#        oracle:
#          driverClassName: oracle.jdbc.OracleDriver
#          url: jdbc:oracle:thin:@//172.30.0.36:1521/XE
#          url: jdbc:oracle:thin:@//localhost:1521/XE
#          username: ROOT
#          password: root
#          druid:
#            validationQuery: SELECT 1 FROM DUAL
#        postgres:
#          driverClassName: org.postgresql.Driver
#          url: jdbc:postgresql://172.30.0.36:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
#          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
#          username: root
#          password: root
#        sqlserver:
#          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
#          url: jdbc:sqlserver://172.30.0.36:1433;DatabaseName=tempdb;SelectMethod=cursor;rewriteBatchedStatements=true
#          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;rewriteBatchedStatements=true
#          username: SA
#          password: root
      druid:
@@ -128,7 +128,7 @@
spring:
  redis:
    # åœ°å€
    host: 172.30.0.48
    host: localhost
    # ç«¯å£ï¼Œé»˜è®¤ä¸º6379
    port: 6379
    # æ•°æ®åº“索引

 ruoyi-admin/src/main/resources/application.yml

@@ -258,9 +258,9 @@
  endpoints:
    web:
      exposure:
        # éœ€è¦å¼€æ”¾çš„端点。默认值只打开 health å’Œ info ä¸¤ä¸ªç«¯ç‚¹ã€‚通过设置 * ï¼Œå¯ä»¥å¼€æ”¾æ‰€æœ‰ç«¯ç‚¹ã€‚
        # ç”Ÿäº§çŽ¯å¢ƒä¸å»ºè®®æ”¾å¼€æ‰€æœ‰ æ ¹æ®é¡¹ç›®éœ€æ±‚放开即可
        include: @endpoints.include@
        include: '*'
  endpoint:
    health:
      show-details: ALWAYS
    logfile:
      external-file: ./logs/sys-console.log

 ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-dev.yml

ÎļþÒÑɾ³ý

 ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application-prod.yml

ÎļþÒÑɾ³ý

 ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml

@@ -22,12 +22,21 @@
management:
  endpoints:
    web:
      # Actuator æä¾›çš„ API æŽ¥å£çš„根目录。默认为 /actuator
      base-path: /actuator
      exposure:
        # éœ€è¦å¼€æ”¾çš„端点。默认值只打开 health å’Œ info ä¸¤ä¸ªç«¯ç‚¹ã€‚通过设置 * ï¼Œå¯ä»¥å¼€æ”¾æ‰€æœ‰ç«¯ç‚¹ã€‚
        # ç”Ÿäº§çŽ¯å¢ƒä¸å»ºè®®æ”¾å¼€æ‰€æœ‰ æ ¹æ®é¡¹ç›®éœ€æ±‚放开即可
        include: @endpoints.include@
        include: '*'
  endpoint:
    health:
      show-details: ALWAYS
    logfile:
      external-file: ./logs/ruoyi-monitor-admin.log

--- # ç›‘控配置
spring.boot.admin.client:
  # å¢žåŠ å®¢æˆ·ç«¯å¼€å…³
  enabled: true
  # è®¾ç½® Spring Boot Admin Server åœ°å€
  url: http://localhost:9090/admin
  instance:
    service-host-type: IP
  username: ruoyi
  password: 123456

 ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-dev.yml

@@ -1,17 +1,13 @@
--- # ç›‘控配置
spring:
  boot:
    admin:
      # Spring Boot Admin Client å®¢æˆ·ç«¯çš„相关配置
      client:
        # å¢žåŠ å®¢æˆ·ç«¯å¼€å…³
        enabled: true
        # è®¾ç½® Spring Boot Admin Server åœ°å€
        url: http://localhost:9090/admin
        instance:
          service-host-type: IP
        username: ruoyi
        password: 123456
spring.boot.admin.client:
  # å¢žåŠ å®¢æˆ·ç«¯å¼€å…³
  enabled: true
  # è®¾ç½® Spring Boot Admin Server åœ°å€
  url: http://localhost:9090/admin
  instance:
    service-host-type: IP
  username: ruoyi
  password: 123456

--- # æ•°æ®åº“配置
spring:

 ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application-prod.yml

@@ -1,17 +1,13 @@
--- # ç›‘控配置
spring:
  boot:
    admin:
      # Spring Boot Admin Client å®¢æˆ·ç«¯çš„相关配置
      client:
        # å¢žåŠ å®¢æˆ·ç«¯å¼€å…³
        enabled: true
        # è®¾ç½® Spring Boot Admin Server åœ°å€
        url: http://172.30.0.90:9090/admin
        instance:
          service-host-type: IP
        username: ruoyi
        password: 123456
spring.boot.admin.client:
  # å¢žåŠ å®¢æˆ·ç«¯å¼€å…³
  enabled: true
  # è®¾ç½® Spring Boot Admin Server åœ°å€
  url: http://localhost:9090/admin
  instance:
    service-host-type: IP
  username: ruoyi
  password: 123456

--- # æ•°æ®åº“配置
spring:

 ruoyi-extend/ruoyi-xxl-job-admin/src/main/resources/application.yml

@@ -37,13 +37,11 @@
      enabled: false
  endpoints:
    web:
      # Actuator æä¾›çš„ API æŽ¥å£çš„根目录。默认为 /actuator
      base-path: /actuator
      exposure:
        # éœ€è¦å¼€æ”¾çš„端点。默认值只打开 health å’Œ info ä¸¤ä¸ªç«¯ç‚¹ã€‚通过设置 * ï¼Œå¯ä»¥å¼€æ”¾æ‰€æœ‰ç«¯ç‚¹ã€‚
        # ç”Ÿäº§çŽ¯å¢ƒä¸å»ºè®®æ”¾å¼€æ‰€æœ‰ æ ¹æ®é¡¹ç›®éœ€æ±‚放开即可
        include: @endpoints.include@
        include: '*'
  endpoint:
    health:
      show-details: ALWAYS
    logfile:
      external-file: ./logs/ruoyi-xxl-job-admin.log


 script/docker/database.yml

@@ -16,7 +16,7 @@
    volumes:
      # æ•°æ®æŒ‚è½½
      - "/docker/oracle/data:/u01/app/oracle"
    restart: always
    network_mode: "host"

  # æ­¤é•œåƒä»…用于测试 æ­£å¼çŽ¯å¢ƒéœ€è‡ªè¡Œå®‰è£…数据库
  sqlserver:
@@ -32,7 +32,7 @@
    volumes:
      # æ•°æ®æŒ‚è½½
      - "/docker/sqlserver/data:/var/opt/mssql"
    restart: always
    network_mode: "host"

  postgres:
    image: postgres:14.2
@@ -45,7 +45,7 @@
      - "5432:5432"
    volumes:
      - /docker/postgres/data:/var/lib/postgresql/data
    restart: always
    network_mode: "host"

  postgres13:
    image: postgres:13.6
@@ -58,4 +58,4 @@
      - "5433:5432"
    volumes:
      - /docker/postgres13/data:/var/lib/postgresql/data
    restart: always
    network_mode: "host"

 script/docker/docker-compose.yml

@@ -26,10 +26,7 @@
      --explicit_defaults_for_timestamp=true
      --lower_case_table_names=1
    privileged: true
    restart: always
    networks:
      ruoyi_net:
        ipv4_address: 172.30.0.36
    network_mode: "host"

  nginx-web:
    image: nginx:1.21.6
@@ -50,9 +47,7 @@
      # æ—¥å¿—目录
      - /docker/nginx/log:/var/log/nginx
    privileged: true
    restart: always
    networks:
      - ruoyi_net
    network_mode: "host"

  redis:
    image: redis:6.2.7
@@ -69,10 +64,7 @@
      - /docker/redis/data/:/redis/data/:rw
    command: "redis-server /redis/config/redis.conf"
    privileged: true
    restart: always
    networks:
      ruoyi_net:
        ipv4_address: 172.30.0.48
    network_mode: "host"

  minio:
    image: minio/minio:RELEASE.2022-05-26T05-48-41Z
@@ -104,10 +96,7 @@
      - /docker/minio/config:/root/.minio/
    command: server --address ':9000' --console-address ':9001' /data  # æŒ‡å®šå®¹å™¨ä¸­çš„目录 /data
    privileged: true
    restart: always
    networks:
      ruoyi_net:
        ipv4_address: 172.30.0.54
    network_mode: "host"

  ruoyi-server1:
    image: ruoyi/ruoyi-server:4.2.0
@@ -115,14 +104,12 @@
    environment:
      # æ—¶åŒºä¸Šæµ·
      TZ: Asia/Shanghai
      SERVER_PORT: 8080
    volumes:
      # é…ç½®æ–‡ä»¶
      - /docker/server1/logs/:/ruoyi/server/logs/
    privileged: true
    restart: always
    networks:
      ruoyi_net:
        ipv4_address: 172.30.0.60
    network_mode: "host"

  ruoyi-server2:
    image: "ruoyi/ruoyi-server:4.2.0"
@@ -130,14 +117,12 @@
    environment:
      # æ—¶åŒºä¸Šæµ·
      TZ: Asia/Shanghai
      SERVER_PORT: 8081
    volumes:
      # é…ç½®æ–‡ä»¶
      - /docker/server2/logs/:/ruoyi/server/logs/
    privileged: true
    restart: always
    networks:
      ruoyi_net:
        ipv4_address: 172.30.0.61
    network_mode: "host"

  ruoyi-monitor-admin:
    image: ruoyi/ruoyi-monitor-admin:4.2.0
@@ -149,10 +134,7 @@
      # é…ç½®æ–‡ä»¶
      - /docker/monitor/logs/:/ruoyi/monitor/logs
    privileged: true
    restart: always
    networks:
      ruoyi_net:
        ipv4_address: 172.30.0.90
    network_mode: "host"

  ruoyi-xxl-job-admin:
    image: ruoyi/ruoyi-xxl-job-admin:4.2.0
@@ -164,14 +146,4 @@
      # é…ç½®æ–‡ä»¶
      - /docker/xxljob/logs/:/ruoyi/xxljob/logs
    privileged: true
    restart: always
    networks:
      ruoyi_net:
        ipv4_address: 172.30.0.92

networks:
  ruoyi_net:
    driver: bridge
    ipam:
      config:
        - subnet: 172.30.0.0/16
    network_mode: "host"

 script/docker/nginx/nginx.conf

@@ -23,16 +23,16 @@

    upstream server {
        ip_hash;
        server 172.30.0.60:8080;
        server 172.30.0.61:8080;
        server 127.0.0.1:8080;
        server 127.0.0.1:8081;
    }

    upstream monitor-admin {
        server 172.30.0.90:9090;
        server 127.0.0.1:9090;
    }

    upstream xxljob-admin {
        server 172.30.0.92:9100;
        server 127.0.0.1:9100;
    }

    server {