Commit 506d1871 authored by 张征龙's avatar 张征龙

Merge branch 'master' into develop

# Conflicts:
#	Dockerfile
parent 3ea109a9
......@@ -7,5 +7,4 @@ ENV LANG en_US.utf8
RUN mkdir /root/duiba-deploy/
ADD ./duiba-deploy /root/duiba-deploy/
ADD ./scripts /root/scripts
ENTRYPOINT java $JAVA_OPS -jar /root/duiba-deploy/$appname.jar --spring.profiles.active=$SPRING_ENV --spring.cloud.config.uri=$CONFIG_SERVER
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment