From fa54f00a9d04c5823be1a38d20ca1f70dbcd3508 Mon Sep 17 00:00:00 2001
From: xiaoxie <hotcoffie@163.com>
Date: 星期五, 05 十一月 2021 20:25:29 +0800
Subject: [PATCH] 尝试docker-compose启动
---
docker/docker-compose.yml | 15 +++++++++++++++
docker/wvp/Dockerfile | 12 ++++++++----
src/main/resources/application-dev.yml | 22 ++++++++++++----------
src/main/resources/application.yml | 2 +-
4 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 6fa43ce..eefb8da 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -12,6 +12,9 @@
wvp:
build:
context: ./wvp
+ args:
+ gitUrl: "https://gitee.com/xieyu1989"
+ zlmGitUrl: "https://gitee.com/xia-chu/ZLMediaKit"
restart: always
ports:
- "5060:5060"
@@ -24,8 +27,20 @@
- "30000-30500:30000-30500/udp"
volumes:
- ./video:/opt/media/www/record/
+ - ./logs/wvp:/opt/wvp/logs/
+ - ./logs/assist:/opt/assist/logs/
+ - ./logs/media:/opt/media/logs/
environment:
TZ: "Asia/Shanghai"
+ REDIS_HOST: redis
+ REDIS_PORT: 6379
+ REDIS_PWD: root
+ WVP_DOMAIN: 6101130049
+ WVP_ID: 61011300490000000001
+ # [蹇呴』淇敼] 鏈満鐨処P
WVP_HOST: 172.18.0.61
+ WVP_PWD: aseqw_+hiy123
+ ASSIST_CONFIG:
+ WVP_CONFIG:
depends_on:
- redis
diff --git a/docker/wvp/Dockerfile b/docker/wvp/Dockerfile
index 334c559..e60a93b 100644
--- a/docker/wvp/Dockerfile
+++ b/docker/wvp/Dockerfile
@@ -1,16 +1,19 @@
FROM ubuntu:20.04 AS build
+ARG gitUrl="https://gitee.com/18010473990"
+ARG zlmGitUrl="https://gitee.com/xia-chu/ZLMediaKit"
+
RUN export DEBIAN_FRONTEND=noninteractive &&\
apt-get update && \
apt-get install -y --no-install-recommends openjdk-11-jre git maven nodejs npm build-essential \
cmake ca-certificates openssl ffmpeg && \
cd /home && \
- git clone https://gitee.com/18010473990/maven.git && \
+ git clone ${gitUrl}/maven.git && \
cp maven/settings.xml /usr/share/maven/conf/ && \
- git clone https://gitee.com/18010473990/wvp-GB28181.git && \
- git clone https://gitee.com/18010473990/wvp-pro-assist.git && \
- git clone --depth=1 https://gitee.com/xia-chu/ZLMediaKit && \
+ git clone ${gitUrl}/wvp-GB28181.git && \
+ git clone ${gitUrl}/wvp-pro-assist.git && \
+ git clone --depth=1 ${zlmGitUrl} && \
mkdir -p /opt/wvp/config /opt/assist/config /opt/media/www/record && \
cd /home/wvp-GB28181/web_src && \
@@ -63,6 +66,7 @@
EXPOSE 30000-30500/udp
RUN export DEBIAN_FRONTEND=noninteractive &&\
+ export LANG=zh_CN.UTF-8
apt-get update && \
apt-get install -y --no-install-recommends openjdk-11-jre ca-certificates ffmpeg language-pack-zh-hans && \
apt-get autoremove -y && \
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 44f70e6..4f7d5f3 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -2,13 +2,13 @@
# REDIS鏁版嵁搴撻厤缃�
redis:
# [蹇呴』淇敼] Redis鏈嶅姟鍣↖P, REDIS瀹夎鍦ㄦ湰鏈虹殑,浣跨敤127.0.0.1
- host: 127.0.0.1
+ host: ${REDIS_HOST:127.0.0.1}
# [蹇呴』淇敼] 绔彛鍙�
- port: 6379
+ port: ${REDIS_PORT:6379}
# [鍙�塢 鏁版嵁搴� DB
database: 6
# [鍙�塢 璁块棶瀵嗙爜,鑻ヤ綘鐨剅edis鏈嶅姟鍣ㄦ病鏈夎缃瘑鐮侊紝灏变笉闇�瑕佺敤瀵嗙爜鍘昏繛鎺�
- password:
+ password: ${REDIS_PWD}
# [鍙�塢 瓒呮椂鏃堕棿
timeout: 10000
# [鍙�塢 jdbc鏁版嵁搴撻厤缃�, 椤圭洰浣跨敤sqlite浣滀负鏁版嵁搴擄紝涓�鑸笉闇�瑕侀厤缃�
@@ -36,18 +36,18 @@
# 浣滀负28181鏈嶅姟鍣ㄧ殑閰嶇疆
sip:
# [蹇呴』淇敼] 鏈満鐨処P
- ip: 192.168.0.100
+ ip: ${WVP_HOST}
# [鍙�塢 28181鏈嶅姟鐩戝惉鐨勭鍙�
port: 5060
# 鏍规嵁鍥芥爣6.1.2涓瀹氾紝domain瀹滈噰鐢↖D缁熶竴缂栫爜鐨勫墠鍗佷綅缂栫爜銆傚浗鏍囬檮褰旸涓畾涔夊墠8浣嶄负涓績缂栫爜锛堢敱鐪佺骇銆佸競绾с�佸尯绾с�佸熀灞傜紪鍙风粍鎴愶紝鍙傜収GB/T 2260-2007锛�
# 鍚庝袱浣嶄负琛屼笟缂栫爜锛屽畾涔夊弬鐓ч檮褰旸.3
# 3701020049鏍囪瘑灞变笢娴庡崡鍘嗕笅鍖� 淇℃伅琛屼笟鎺ュ叆
# [鍙�塢
- domain: 4401020049
+ domain: ${WVP_DOMAIN:4401020049}
# [鍙�塢
- id: 44010200492000000001
+ id: ${WVP_ID:44010200492000000001}
# [鍙�塢 榛樿璁惧璁よ瘉瀵嗙爜锛屽悗缁墿灞曚娇鐢ㄨ澶囧崟鐙瘑鐮�, 绉婚櫎瀵嗙爜灏嗕笉杩涜鏍￠獙
- password: admin123
+ password: ${WVP_PWD:admin123}
#zlm 榛樿鏈嶅姟鍣ㄩ厤缃�
media:
@@ -66,8 +66,9 @@
# [鍙�塢 鍥芥爣绾ц仈鍦ㄦ鑼冨洿鍐呴�夋嫨绔彛鍙戦�佸獟浣撴祦,
send-port-range: 30000,30500 # 绔彛鑼冨洿
# 褰曞儚杈呭姪鏈嶅姟锛� 閮ㄧ讲姝ゆ湇鍔″彲浠ュ疄鐜皕lm褰曞儚鐨勭鐞嗕笌涓嬭浇锛� 0 琛ㄧず涓嶄娇鐢�
- record-assist-port: 0
-
+ record-assist-port: 18081
+ sdp-ip: ${WVP_HOST}
+ stream-ip: ${WVP_HOST}
# [鍙�塢 鏃ュ織閰嶇疆, 涓�鑸笉闇�瑕佹敼
logging:
file:
@@ -84,6 +85,7 @@
user-settings:
# 鎺ㄦ祦鐩存挱鏄惁褰曞埗
record-push-live: true
+ auto-apply-play: false
# 鍦ㄧ嚎鏂囨。锛� swagger-ui锛堢敓浜х幆澧冨缓璁叧闂級
swagger-ui:
@@ -93,4 +95,4 @@
version:
version: "@project.version@"
description: "@project.description@"
- artifact-id: "@project.artifactId@"
\ No newline at end of file
+ artifact-id: "@project.artifactId@"
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ef46c2a..3d7808a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,3 +1,3 @@
spring:
profiles:
- active: local
\ No newline at end of file
+ active: dev
--
Gitblit v1.8.0