18 Commits

Author	SHA1	Message	Date
Tan Jiang	a33f4151e2	merge with dev branch	2017-03-24 14:40:34 +08:00
Tan Jiang	980101eab5	package vmware/registry into offline package	2017-03-23 12:36:36 +08:00
Tan Jiang	44cd3ec85b	update make file and docker compose template	2017-03-22 20:56:08 +08:00
Tan Jiang	f9180c0c96	rebuild registry image on photon	2017-03-22 20:27:15 +08:00
Wenkai Yin	383997f785	read capacity from adminserver	2017-03-21 16:28:24 +08:00
Wenkai Yin	108aa21499	upgrade registry to 2.6.0	2017-03-16 13:44:16 +08:00
yhua	9f18c8458b	fix #1332	2017-02-27 18:52:22 +08:00
Wenkai Yin	9f3f48be59	add harbor network to adminserver	2017-02-24 14:35:11 +08:00
Wenkai Yin	414e8a8bcf	Merge remote-tracking branch 'upstream/dev' into 170224_merge_config ... Conflicts: make/docker-compose.tpl src/ui/service/token/authutils.go	2017-02-24 13:52:19 +08:00
Wenkai Yin	40eb6bb7d3	encrypt passwords enhancement	2017-02-22 16:59:28 +08:00
Wenkai Yin	390f89ee0a	encrypt passwords and secret	2017-02-17 18:23:21 +08:00
Daniel Jiang	a17cd5bcfe	add a default network for containers in harbor (#1384) ... LGTM	2017-02-16 14:51:21 +08:00
Wenkai Yin	b62a958250	configure harbor	2017-01-12 17:15:32 +08:00
yhua	0249f2181a	update registry from 2.5.0 to 2.5.1	2016-12-15 16:50:50 +08:00
kunw	55b98f9abd	Merge remote-tracking branch 'upstream/dev' into dev-volume-info	2016-11-09 14:53:26 +08:00
Wenkai Yin	4fcfffeb47	upgrade nginx to 1.11.5	2016-11-02 15:49:28 +08:00
kunw	560b41b5e6	Merge remote-tracking branch 'upstream/dev' into dev-volume-info	2016-11-02 12:46:57 +08:00
yhua	03e2a3ee56	remove tag in docker-compose.yml	2016-10-26 13:09:12 +08:00