Merge branch 'master' of gitlab2.dui88.com:zhangzhenglong/miria-project-test into test

# Conflicts: # Dockerfile

Merge branch 'master' of gitlab2.dui88.com:zhangzhenglong/miria-project-test into test
# Conflicts: # Dockerfile
3b80871c · 张征龙 · c6d64870 · 2d768c35 · 3b80871c · 3b80871c
Commit 3b80871c authored Sep 30, 2019 by 张征龙
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

Dockerfile Dockerfile +1 -2

settings.gradle settings.gradle +2 -0

No files found.
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,5 +7,4 @@ ENV LANG en_US.utf8
 RUN mkdir /root/duiba-deploy/
 ADD ./duiba-deploy /root/duiba-deploy/
 ADD ./scripts /root/scripts
-#master
-ENTRYPOINT java $JAVA_OPS -jar /root/duiba-deploy/$appname.jar --spgitring.profiles.active=$SPRING_ENV --spring.cloud.config.uri=$CONFIG_SERVER
\ No newline at end of file
+ENTRYPOINT java $JAVA_OPS -jar /root/duiba-deploy/$appname.jar --spgitring.profiles.active=$SPRING_ENV --spring.cloud.config.uri=$CONFIG_SERVER
--- a/settings.gradle
+++ b/settings.gradle
 rootProject.name = 'miria-project-test'
+
+