From 621518e84ad75f819f8171f143be3fc7668e81d3 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期六, 07 十一月 2020 17:37:45 +0800
Subject: [PATCH] 增加dockfile
---
DOCKERFILE | 32 ++++++++++++++++++++++++++++++++
pom.xml | 9 +++++----
README.md | 2 +-
3 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/DOCKERFILE b/DOCKERFILE
new file mode 100644
index 0000000..cc86e27
--- /dev/null
+++ b/DOCKERFILE
@@ -0,0 +1,32 @@
+FROM ubuntu:19.10
+
+EXPOSE 18080/tcp
+EXPOSE 5060/tcp
+
+# 浣跨敤浜嗚嚜宸辩殑settings.xml浣滀负maven鐨勬簮,鍔犲揩鎵撳寘閫熷害
+RUN apt-get update && \
+ apt-get install -y --no-install-recommends openjdk-11-jre git maven nodejs npm && \
+ cd /home && \
+ git clone https://github.com/648540858/wiki.git && \
+ cp wiki/config/settings.xml /usr/share/maven/conf/ && \
+ git clone https://github.com/648540858/wvp-GB28181.git && \
+ cd /home/wvp-GB28181/web_src && \
+ npm install npm -g && \
+ npm install nrm -g && \
+ nrm use taobao && \
+ npm install && \
+ npm run build && \
+ mkdir -p /opt/wvp/config && \
+ cd /home/wvp-GB28181 && \
+ mvn compile && \
+ mvn package && \
+ cp /home/wvp-GB28181/target/wvp-1.5.10.RELEASE.jar /opt/wvp/ && \
+ rm -rf /home/wiki && \
+ rm -rf /home/wvp-GB28181 && \
+ apt-get autoremove -y git maven nodejs npm && \
+ apt-get clean -y && \
+ rm -rf /var/lib/apt/lists/*dic
+
+WORKDIR /opt/wvp
+
+CMD java -jar wvp-1.5.10.RELEASE.jar --spring.config.location=/opt/wvp/config/application.yml
\ No newline at end of file
diff --git a/README.md b/README.md
index df15500..80ce77a 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@
7. 鏀寔閫氶亾瀛愮洰褰曟煡璇�;
8. 鏀寔udp/tcp鍥芥爣娴佷紶杈撴ā寮�;
9. 鏀寔鐩存帴杈撳嚭RTSP銆丷TMP銆丠TTP-FLV銆乄ebsocket-FLV銆丠LS澶氱鍗忚娴佸湴鍧�
-10. 鏀寔鍥芥爣缃戠粶鏍℃椂
+10. 鏀寔鍥芥爣缃戠粶鏍℃椂
# 寰呭疄鐜帮細
涓婄骇绾ц仈
diff --git a/pom.xml b/pom.xml
index 0463182..0f6e9c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,7 +163,6 @@
<build>
<plugins>
-
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
@@ -177,7 +176,8 @@
<configuration>
<source>1.8</source>
<target>1.8</target>
- <!-- <webResources>
+<<<<<<< HEAD
+ <webResources>
<resource>
<directory>${project.basedir}/libs</directory>
<targetPath>WEB-INF/lib</targetPath>
@@ -186,7 +186,9 @@
<include>**/*.jar</include>
</includes>
</resource>
- </webResources> -->
+ </webResources>
+=======
+>>>>>>> upstream/master
</configuration>
</plugin>
@@ -194,7 +196,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
</plugin>
-
</plugins>
</build>
</project>
--
Gitblit v1.8.0