Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-17 15:55:26 +01:00
Code Issues Projects Releases Wiki Activity
6,703 Commits 49 Branches 315 Tags 351 MiB
d996c958a0
Commit Graph

6703 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qian Deng
286167ad74
Merge pull request #7755 from ninjadq/fix_rendering_none_in_jinja 
Fix None rendered in jinja2
 2019-05-10 14:59:21 +08:00
danfengliu
8a2ee784a4
Missing modification in keyword <Create A New Endpoint>, due to changing of docker-hub select item, it must be modified. (#7754) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-05-10 14:24:12 +08:00
Wenkai Yin
8348c1fa4b
Merge pull request #7635 from heww/validation-failed-status-code 
Return 400 status code for validation failed
 2019-05-10 14:22:05 +08:00
Wenkai Yin
a7384fc881 Fixes bug in replication 
Use internal service name rather than 127.0.0.1 when calling APIs of core in jobservice jobs

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-05-10 14:18:57 +08:00
Daniel Jiang
b802f14e1f Fix a bug of checking docker version in install.sh 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-05-10 13:55:04 +08:00
Wang Yan
ef4afff8b0
Update default value of external_database (#7756) 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-05-10 13:41:47 +08:00
stonezdj(Daojun Zhang)
978c7027a1 Add document for admin server refactor (#7479) 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-05-10 13:25:36 +08:00
Qian Deng
f9f9661acd New type of bind volume 
using long style bind volume

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-05-10 13:18:48 +08:00
Qian Deng
cd9932db23 Update the path of server.key and server.crt 
change the path of cert key paris to prevent futrue issues.

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-05-10 13:18:48 +08:00
Qian Deng
3dfebed98e Enhance: Add an empty cert files if not exist 
To avoid confusion error message

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-05-10 13:18:48 +08:00
Qian Deng
6ea0514bb7 Revert "Set default mode to https" 
This reverts commit 8a308a63e2.

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-05-10 13:18:48 +08:00
Steven Zou
e091916d54 fix UT case failure (#7734) 
Signed-off-by: Steven Zou <szou@vmware.com>
 2019-05-10 13:15:44 +08:00
Daniel Jiang
64b16c8915 Enable cfg migration from v1.8.0 (#7751) 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-05-10 13:14:46 +08:00
Daniel Jiang
bae6f17ad3 Update migration guide for v1.8.0 (#7752) 
Make necessary updates to reflect the new command to migrate
configuration file from harbor.cfg to harbor.yml

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-05-10 13:03:01 +08:00
Qian Deng
96bb638067
Merge pull request #7749 from reasonerjt/install-sh-chk 
Update the version check in install.sh
 2019-05-10 12:56:37 +08:00
Qian Deng
0aaccf62b2 Fix None rendered in jinja2 
jinja2 render None to empty string

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-05-10 12:17:02 +08:00
Qian Deng
bb66358df8 Update migratrion script (#7728) 
* Fix migration script

1. port is string when parsed from configparser
2. remove index and db_user in if condition

Signed-off-by: Qian Deng <dengq@vmware.com>

* Add port to public_url

Add port to public_url

Signed-off-by: Qian Deng <dengq@vmware.com>

* Customized value for notary and clair

db config in notary and clair is hardcoded

Signed-off-by: Qian Deng <dengq@vmware.com>

* Add notary and clair db config in harbor.yml

Add notary clair config to harbor.yml and fix related regression

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-05-10 10:44:05 +08:00
jwangyangls
4218206b59
Merge pull request #7753 from jwangyangls/addOidcMoreLink 
Add Oidc more info link in configration
 2019-05-10 10:37:52 +08:00
He Weiwei
58cbaaace8 Return 400 status code for validation failed 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-05-10 10:35:25 +08:00
Wenkai Yin
ae3b75d33b
Merge pull request #7657 from zhoumeina/swagger_guide 
add swagger user guide
 2019-05-10 10:30:05 +08:00
Fangyuan Cheng
aa68471dfa
Merge pull request #7743 from pureshine/modify-text 
Modify the prompt for deleting resources when creating a replication rule.
 2019-05-10 00:17:47 +08:00
Yogi_Wang
cd42637f51 Add Oidc more info link in configration 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-05-10 00:04:33 +08:00
Daniel Jiang
4b6e2946c3
Merge pull request #7738 from reasonerjt/cfg-yml-migrator 
Require output path for harbor.cfg->harbor.yml migration
 2019-05-09 22:33:04 +08:00
Wang Yan
774a9f8d75
Remove unused configure item cfg_expiration (#7744) 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-05-09 22:07:18 +08:00
Wenkai Yin
9cc203d15b
Merge pull request #7740 from ywk253100/190509_huawei 
Rename the adapter name of huawei to huawei-SWR
 2019-05-09 21:53:24 +08:00
Wenkai Yin
5ce57a24ac
Merge pull request #7739 from ywk253100/190508_upgrade 
Fixes #7693, the filters of replication policy is lost after upgrade
 2019-05-09 20:16:13 +08:00
Daniel Jiang
4c18f487ad Update the version check in install.sh 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-05-09 19:18:52 +08:00
Daniel Jiang
546bd44047 Require output path for harbor.cfg->harbor.yml migration 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-05-09 19:11:22 +08:00
Wenkai Yin
b4d766c8a8
Merge pull request #7747 from ywk253100/190509_bug_fix 
Fix travis failure: read the content of env instead of config_env as the config_env has been removed
 2019-05-09 18:34:18 +08:00
jwangyangls
cc4da4bbbd
Merge pull request #7725 from jwangyangls/fixCancel_cannot_work 
Fix question of `Cancel` of OIDC configuration does not work
 2019-05-09 17:40:15 +08:00
Wenkai Yin
b3a344b60e Fix travis failure: read the content of env instead of config_env as the config_env has been removed 
Read the content of env instead of config_env as the config_env has been removed

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-05-09 17:26:56 +08:00
Wenkai Yin
b73f8a96c3 Fix issue: replication cannot work when Harbor is deployed on Kubernetes whose hairpin mode is disabled (#7718) 
Fix issue https://github.com/goharbor/harbor-helm/issues/222: replication cannot work when Harbor is deployed on Kubernetes whose hairpin mode is disabled

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-05-09 17:10:32 +08:00
Wenkai Yin
4f6116f9c0 Rename the adapter name of huawei to huawei-SWR 
Rename the adapter name of huawei to huawei-SWR. Fixes #7732

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-05-09 17:00:00 +08:00
Mia ZHOU
4e583ad65a
Merge pull request #7731 from jwangyangls/fix_ui_issue1.8 
Fix uncheck pull for the robot account generation, pull permission is still assigned
 2019-05-09 16:42:11 +08:00
Mia ZHOU
94a6e997ad
Merge pull request #7735 from pureshine/refresh-gc 
Automatically refresh the list when the status of gc history is pending or running
 2019-05-09 16:41:29 +08:00
Qian Deng
39f2bf2dfe
Merge pull request #7639 from ninjadq/fix_chart_storage_issue 
Fix chart storage keyfile issue in gcs
 2019-05-09 16:26:03 +08:00
Wenkai Yin
8e9b9f8942
Merge pull request #7736 from wy65701436/fix-7675 
Return 200 when to post an none schedule
 2019-05-09 16:15:55 +08:00
danfengliu
dffb2bbd98 Due to replication NG feature already in master branch, old replication UI test cases have been moved out of Jenkins pipeline, and here test case <Replication Of Pull Images from DockerHub To Self> and <Replication Of Push Images from Self To Harbor> has been finished and ready for duty. Other modification is add retry for keywords in UserProfile.robot (#7611) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-05-09 15:44:48 +08:00
FangyuanCheng
83de21601b Modify the prompt for deleting resources when creating a replication rule. 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-05-09 15:38:41 +08:00
Wang Yan
7e674ec389
bump up required docker compose version to 1.18 (#7737) 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-05-09 15:35:42 +08:00
Daniel Jiang
a67cc2b8b5
Merge pull request #7640 from ninjadq/remove_env_duplicate_items 
Remove duplicate env items
 2019-05-09 15:35:26 +08:00
Wenkai Yin
8ca3c44b87 Fixes #7693, the filters of replication policy is lost after upgrade 
Fixes #7693, the filters of replication policy is lost after upgrade

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-05-09 14:13:32 +08:00
Meina Zhou
3869c6ca56 add swagger user guide 
Signed-off-by: Meina Zhou <meinaz@vmware.com>
 2019-05-09 13:50:33 +08:00
wang yan
5c12c7713d Return 200 when to post an none schedule 
1, Throw the error of job service to UI when to create job schedule.
2, Return 200 when to save none without schedule.

Fixed #7675

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-05-09 13:32:46 +08:00
Wang Yan
c028b281ea
Update required docker and docker-compose version (#7733) 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-05-09 13:29:07 +08:00
FangyuanCheng
78c52eca8a Automatically refresh the list when the status of gc history is pending or running 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-05-09 13:15:11 +08:00
Qian Deng
322b108acf Remove duplicate env items 
some env items are duplicate in both env and config_env file

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-05-09 10:55:39 +08:00
Daniel Jiang
cbbf2ea973 Redirect regular user to OIDC login page (#7717) 
When the auth mode is OIDC, when a user login via Harbor's login form.
If the user does not exist or the user is onboarded via OIDC, he will be
redirected to the OIDC login page.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-05-09 10:53:40 +08:00
Fangyuan Cheng
1828537672
Merge pull request #7723 from pureshine/filter-loading 
Fix filter will always show loading when call API failed
 2019-05-09 10:41:24 +08:00
Haining Henry Zhang
b5412b9476 update documents (#7727) 
Signed-off-by: Henry Zhang <haininghenryzh@vmware.com>
 2019-05-09 09:49:30 +08:00