Skip to content

M
miria-project-test
Commit dba4ba43 authored by 张征龙's avatar 张征龙
Browse files
Options

Merge branch 'test1' into develop 

# Conflicts:
#	Dockerfile
parent 1bd83213
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 2 deletions
Dockerfile
View file @ dba4ba43
...@@ -7,5 +7,4 @@ RUN mkdir /root/duiba-deploy/ ...@@ -7,5 +7,4 @@ RUN mkdir /root/duiba-deploy/
ADD ./duiba-deploy /root/duiba-deploy/ ADD ./duiba-deploy /root/duiba-deploy/
ADD ./scripts /root/scripts ADD ./scripts /root/scripts
#define entry point which will be run first when the container starts up #define entry point which will be run first when the container starts up
#asdad ENTRYPOINT java $JAVA_OPS -jar /root/duiba-deploy/$appname.jar --gitspring.profiles.active=$SPRING_ENV --spring.cloud.config.uri=$CONFIG_SERVER
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
\ 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