Skip to content

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

Merge branch 'master' into develop 

# Conflicts:
#	Dockerfile
parents 10039a4a 38a51314
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 1 deletion
Dockerfile
View file @ 981f26bf
#FROM registry.cn-hangzhou.aliyuncs.com/duiba/duiba-jdk8
FROM registry.cn-hangzhou.aliyuncs.com/duiba/duiba-jdk8
MAINTAINER op@duiba.com.cn
ARG appname
......
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