Commit Graph

2532 Commits

Author SHA1 Message Date
Wenkai Yin
d83554013b Merge remote-tracking branch 'upstream/dev' into 170321_url 2017-03-24 14:56:55 +08:00
Tan Jiang
a33f4151e2 merge with dev branch 2017-03-24 14:40:34 +08:00
Yan
e2fe74598b Merge pull request #1776 from wy65701436/dev
add -v to docker-compose down
2017-03-24 14:05:48 +08:00
Daniel Jiang
9be6793ebd Merge pull request #1775 from reasonerjt/dev
Generate new certificate for notary signer in prepare.
2017-03-24 13:57:43 +08:00
wy65701436
02431de5a4 add -v to docker-compose down 2017-03-23 22:45:01 -07:00
Tan Jiang
3e8d71538f generate cert for notary signer in prepare,
update the default certificates so the subject is formal.
2017-03-24 13:33:49 +08:00
Tan Jiang
90bc280ea1 add a 4443 ssl server to nginx config 2017-03-24 13:16:48 +08:00
Wenkai Yin
e77e2333ec refactor some uts of adminserver 2017-03-24 13:07:45 +08:00
Steven Zou
02c3d4d623 Merge pull request #1770 from wknet123/dev-revised
Fix issues per testing and merge latest updates.
2017-03-24 11:00:46 +08:00
Daniel Jiang
52b417e504 Merge pull request #1773 from wy65701436/dev
replace startuptest
2017-03-24 10:40:20 +08:00
wy65701436
5f33b3f933 replace startuptest 2017-03-23 19:12:04 -07:00
kunw
9a4ba69026 Fix issues per testing and merge latest updates. 2017-03-24 01:04:42 +08:00
Tan Jiang
6b55bf488a Merge remote-tracking branch 'upstream/dev' into dev 2017-03-23 21:02:05 +08:00
Tan Jiang
402a482bc6 generate cert for notary signer in prepare 2017-03-23 21:00:53 +08:00
Yan
74e7b66aa0 Merge pull request #1734 from wknet123/dev-revised
Merge latest updates for UX refinements.
2017-03-23 16:04:43 +08:00
Yan
0dc1589c32 Merge pull request #1732 from wy65701436/dev
add doc for make
2017-03-23 15:51:43 +08:00
kunw
801a83ffd5 Add restriction for repositories and tags. 2017-03-23 15:48:45 +08:00
kunw
01d9930b5a Merge latest updates for UX refinements. 2017-03-23 15:36:41 +08:00
wy65701436
9d4b36a97c add doc for make 2017-03-23 00:20:18 -07:00
Yan
4ab5f5ed16 Merge pull request #1730 from reasonerjt/dev
add a simple guide for notary on harbor
2017-03-23 13:50:39 +08:00
Tan Jiang
a588819ce0 add a simple guide for notary on harbor 2017-03-23 13:48:36 +08:00
Yan
ce365c3b81 Merge pull request #1727 from reasonerjt/registry-photon
use registry on photon image.
2017-03-23 13:05:57 +08:00
Tan Jiang
8b1eaded2f update Makefile 2017-03-23 12:40:11 +08:00
Tan Jiang
980101eab5 package vmware/registry into offline package 2017-03-23 12:36:36 +08:00
Wenkai Yin
9e12274309 Merge remote-tracking branch 'upstream/dev' into 170321_url
Conflicts:
	src/ui/router.go
2017-03-23 11:19:34 +08:00
Daniel Jiang
610b2dd620 Merge branch 'dev' into registry-photon 2017-03-23 11:03:54 +08:00
Daniel Jiang
6d013531a7 Merge pull request #1717 from reasonerjt/dev
restrict access to notary db
2017-03-23 11:01:01 +08:00
kun wang
316f815315 Merge pull request #1721 from wknet123/dev-revised
Merge latest UI codes.
2017-03-23 10:54:39 +08:00
Tan Jiang
44cd3ec85b update make file and docker compose template 2017-03-22 20:56:08 +08:00
kunw
9419b632f2 Merge latest UI codes. 2017-03-22 20:54:22 +08:00
Tan Jiang
1e90b1eab6 update Makefile 2017-03-22 20:31:21 +08:00
Tan Jiang
f9180c0c96 rebuild registry image on photon 2017-03-22 20:27:15 +08:00
Daniel Jiang
88ad24d99d Merge pull request #1718 from wy65701436/dev
add notary test
2017-03-22 19:59:05 +08:00
wy65701436
8f31230255 add notary test 2017-03-22 04:30:20 -07:00
Tan Jiang
3c16d6c1a1 restrict access to notary db 2017-03-22 18:15:16 +08:00
Daniel Jiang
872a01b342 Merge pull request #1705 from wy65701436/dev
add version support
2017-03-22 15:50:08 +08:00
Wenkai Yin
b461ba54a8 refactor api. 2017-03-22 14:30:49 +08:00
wy65701436
677359b606 remove file exist. 2017-03-21 22:20:44 -07:00
wy65701436
5a764d30ea remove file exist. 2017-03-21 22:07:12 -07:00
wy65701436
8268cf66bd update swagger 2017-03-21 18:56:42 -07:00
wy65701436
1a9eb09f12 add version file, and fix go issue. 2017-03-21 18:40:21 -07:00
wy65701436
e667bd7a79 add version file 2017-03-21 18:39:09 -07:00
wy65701436
5baf565c00 update swagger.yaml 2017-03-21 18:28:01 -07:00
wy65701436
c5633f7ce8 add version support 2017-03-21 04:56:59 -07:00
Daniel Jiang
7f099ebe50 Merge pull request #1703 from reasonerjt/dev
Use notary images based on photon, migrate db in notary's images
2017-03-21 19:35:27 +08:00
Tan Jiang
6e09ae89e3 Use notary images based on photon, migrate db in notary's images 2017-03-21 18:46:10 +08:00
Daniel Jiang
f96978cc24 Merge pull request #1699 from wy65701436/dev
update git ignore
2017-03-21 17:52:47 +08:00
Daniel Jiang
a05f1e3507 Merge pull request #1700 from ywk253100/170321_mount_data
Read capacity from adminserver
2017-03-21 16:42:32 +08:00
Wenkai Yin
753a544294 fix merge issue 2017-03-21 16:29:51 +08:00
Wenkai Yin
383997f785 read capacity from adminserver 2017-03-21 16:28:24 +08:00