guzijian / wvp-GB28181-pro · Commits

Commit 0984290ca2a75cf0316c3ca312bf8026b4edcf3e

Authored by xiaoxie
1 parent f8967275

继续优化docker配置： 

1.启动命令增加ASSIST_JVM_CONFIG和WVP_JVM_CONFIG两个字段，方便配置JVM参数
2.修复一处错误，application.yml media.stream-ip的值应该等于media.ip而不是之前的sip.ip
Inline Side-by-side
Showing 3 changed files with 7 additions and 5 deletions
docker/docker-compose.yml
  View file @0984290
... ... @@ -41,6 +41,8 @@ services:
41 41 REDIS_PORT: 6379
42 42 REDIS_DB: 6
43 43 REDIS_PWD: root
  44 + ASSIST_JVM_CONFIG: -Xms128m -Xmx256m
  45 + WVP_JVM_CONFIG: -Xms128m -Xmx256m
44 46 ASSIST_CONFIG:
45 47 WVP_CONFIG:
46 48 depends_on:
... ...
docker/wvp/Dockerfile
  View file @0984290
... ... @@ -47,10 +47,10 @@ RUN cd /opt/wvp && \
47 47 echo 'echo ${WVP_IP}' >> run.sh && \
48 48 echo 'echo ${WVP_CONFIG}' >> run.sh && \
49 49 echo 'cd /opt/assist' >> run.sh && \
50   - echo 'nohup java -Xms128m -Xmx256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/assist/heapdump/ -jar *.jar --spring.config.location=/opt/assist/config/application.yml --userSettings.record=/opt/media/www/record/ --media.record-assist-port=18081 ${ASSIST_CONFIG} &' >> run.sh && \
  50 + echo 'nohup java ${ASSIST_JVM_CONFIG} -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/assist/heapdump/ -jar *.jar --spring.config.location=/opt/assist/config/application.yml --userSettings.record=/opt/media/www/record/ --media.record-assist-port=18081 ${ASSIST_CONFIG} &' >> run.sh && \
51 51 echo 'nohup /opt/media/MediaServer -d -m 3 &' >> run.sh && \
52 52 echo 'cd /opt/wvp' >> run.sh && \
53   - echo 'java -Xms128m -Xmx256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/wvp/heapdump/ -jar *.jar --spring.config.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 ${WVP_CONFIG}' >> run.sh && \
  53 + echo 'java ${WVP_JVM_CONFIG} -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/opt/wvp/heapdump/ -jar *.jar --spring.config.location=/opt/wvp/config/application.yml --media.record-assist-port=18081 ${WVP_CONFIG}' >> run.sh && \
54 54 chmod +x run.sh
55 55  
56 56 FROM ubuntu:20.04
... ...
src/main/resources/application-docker.yml
  View file @0984290
... ... @@ -8,7 +8,7 @@ spring:
8 8 # [可选] 数据库 DB
9 9 database: ${REDIS_DB:6}
10 10 # [可选] 访问密码,若你的redis服务器没有设置密码，就不需要用密码去连接
11   - password: ${REDIS_PWD:}
  11 + password: ${REDIS_PWD:root}
12 12 # [可选] 超时时间
13 13 timeout: 10000
14 14 # [可选] jdbc数据库配置, 项目使用sqlite作为数据库，一般不需要配置
... ... @@ -67,7 +67,7 @@ media:
67 67 send-port-range: 30000,30500 # 端口范围
68 68 # 录像辅助服务， 部署此服务可以实现zlm录像的管理与下载， 0 表示不使用
69 69 record-assist-port: 18081
70   - sdp-ip: ${sip.ip}
  70 + sdp-ip: ${media.ip}
71 71 stream-ip: ${sip.ip}
72 72 # [可选] 日志配置, 一般不需要改
73 73 logging:
... ... @@ -85,7 +85,7 @@ logging:
85 85 user-settings:
86 86 # 推流直播是否录制
87 87 record-push-live: true
88   - auto-apply-play: false
  88 + auto-apply-play: true
89 89  
90 90 # 在线文档： swagger-ui（生产环境建议关闭）
91 91 swagger-ui:
... ...