harbor/make/dev
Wenkai Yin 75f660fa77 Merge remote-tracking branch 'upstream/dev' into 161228_config
Conflicts:
	make/common/templates/ui/env
	src/ui/auth/ldap/ldap.go
	src/ui/config/config.go
2017-01-12 17:41:14 +08:00
..
adminserver configure harbor 2017-01-12 17:15:32 +08:00
jobservice remove openldap lib from Dockerfile and support build with offcial golang image(1.7.3) 2017-01-04 17:48:20 +08:00
ui remove openldap lib from Dockerfile and support build with offcial golang image(1.7.3) 2017-01-04 17:48:20 +08:00
docker-compose.yml configure harbor 2017-01-12 17:15:32 +08:00