Skip to content

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

Merge branch 'test1' into develop 

# Conflicts:
#	Dockerfile
parent a9aafca6
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
Dockerfile
View file @ c6d64870
FROM registry.cn-hangzhou.aliyuncs.com/duiba/duiba-jdk8
#FROM registry.cn-hangzhou.aliyuncs.com/duiba/duiba-jdk8
FROM harbor.dui88.com/library/build_image:jdk181
MAINTAINER op@duiba.com.cn
ARG appname
ARG environment
......@@ -6,5 +7,5 @@ ENV LANG en_US.utf8
RUN mkdir /root/duiba-deploy/
ADD ./duiba-deploy /root/duiba-deploy/
ADD ./scripts /root/scripts
#define entry point which will be run first when the container starts up
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
#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
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