diff --git a/DOCKERFILE b/DOCKERFILE
new file mode 100644
index 00000000..cc86e274
--- /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 df155003..80ce77a7 100644
--- a/README.md
+++ b/README.md
@@ -34,7 +34,7 @@ WEB VIDEO PLATFORM是一个基于GB28181-2016标准实现的网络视频平台
 7. 支持通道子目录查询;  
 8. 支持udp/tcp国标流传输模式;  
 9. 支持直接输出RTSP、RTMP、HTTP-FLV、Websocket-FLV、HLS多种协议流地址  
-10. 支持国标网络校时
+10. 支持国标网络校时  
 
 # 待实现： 
 上级级联  
diff --git a/pom.xml b/pom.xml
index 04631821..0f6e9c92 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>