diff --git a/docker/.env b/docker/.env index efb50b3..9b1b4fc 100644 --- a/docker/.env +++ b/docker/.env @@ -16,4 +16,4 @@ SIP_Password=wvp_sip_password RecordSip=true -RecordPushLive= \ No newline at end of file +RecordPushLive=false \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index c0b75a9..5564814 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -61,14 +61,14 @@ services: ports: #- "6080:80/tcp" # [播流]HTTP 安全考虑-非测试阶段需要注释掉,改为由nginx代理播流地址 #- "4443:443/tcp" # [播流]HTTPS 安全考虑-非测试阶段需要注释掉,改为由nginx代理播流地址 - - "${MediaRtmp:-10935}:${MediaRtmp:-10935}/tcp" # [收流]RTMP - - "${MediaRtmp:-10935}:${MediaRtmp:-10935}/udp" # [收流]RTMP + - "${MediaRtmp:-10001}:${MediaRtmp:-10001}/tcp" # [收流]RTMP + - "${MediaRtmp:-10001}:${MediaRtmp:-10001}/udp" # [收流]RTMP #- "41935:41935/tcp" # [收流]RTMPS 无效 - - "${MediaRtsp:-5540}:${MediaRtsp:-5540}/tcp" # [收流]RTSP - - "${MediaRtsp:-5540}:${MediaRtsp:-5540}/udp" # [收流]RTSP + - "${MediaRtsp:-10002}:${MediaRtsp:-10002}/tcp" # [收流]RTSP + - "${MediaRtsp:-10002}:${MediaRtsp:-10002}/udp" # [收流]RTSP #- "45540:45540/tcp" # [收流]RTSPS 无效 - - "${MediaRtp:-10000}:${MediaRtp:-10000}/tcp" # [收流]RTP - - "${MediaRtp:-10000}:${MediaRtp:-10000}/udp" # [收流]RTP + - "${MediaRtp:-10003}:${MediaRtp:-10003}/tcp" # [收流]RTP + - "${MediaRtp:-10003}:${MediaRtp:-10003}/udp" # [收流]RTP volumes: - ./volumes/video:/opt/media/bin/www/record/ - ./logs/media:/opt/media/log/ @@ -96,9 +96,9 @@ services: - ./logs/wvp:/opt/wvp/logs/ environment: TZ: "Asia/Shanghai" - Stream_IP: ${Stream_IP:127.0.0.1} + Stream_IP: ${Stream_IP:-127.0.0.1} # SDP里的IP - SDP_IP: ${SDP_IP:127.0.0.1} + SDP_IP: ${SDP_IP:-127.0.0.1} # [可选] zlm服务器访问WVP所使用的IP, 默认使用127.0.0.1,zlm和wvp没有部署在同一台服务器时必须配置 ZLM_HOOK_HOST: polaris-wvp ZLM_HOST: polaris-media @@ -118,14 +118,14 @@ services: DATABASE_USER: wvp_user DATABASE_PASSWORD: wvp_password - SIP_ShowIP: ${SIP_ShowIP:127.0.0.1} + SIP_ShowIP: ${SIP_ShowIP:-127.0.0.1} SIP_Port: ${SIP_Port:-8160} - SIP_Domain: ${SIP_Domain:3502000000} - SIP_Id: ${SIP_Id:35020000002000000001} - SIP_Password: ${SIP_Password:wvp_sip_password} + SIP_Domain: ${SIP_Domain:-3502000000} + SIP_Id: ${SIP_Id:-35020000002000000001} + SIP_Password: ${SIP_Password:-wvp_sip_password} - RecordSip: ${RecordSip:true} - RecordPushLive: ${RecordPushLive:false} + RecordSip: ${RecordSip:-true} + RecordPushLive: ${RecordPushLive:-false} polaris-nginx: # 显式指定构建上下文和Dockerfile路径