Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-27 20:59:10 +01:00
Code Issues Projects Releases Wiki Activity
6,741 Commits 53 Branches 317 Tags 334 MiB
b9f45cd30a
Commit Graph

6741 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
liqiang-fit2cloud
218889acdd Fix issue: https://github.com/goharbor/harbor/issues/7288 
Signed-off-by: liqiang-fit2cloud <liqiang@fit2cloud.com>
 2019-05-09 18:57:57 +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
Yogi_Wang
48aac9ae2c Fix uncheck pull for the robot account generation, pull permission is still assigned 
fix Uncheck pull for the robot account generation, pull permission is still assigned

Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-05-09 00:37:49 +08:00
jwangyangls
67c5542dd8
Merge pull request #7716 from jwangyangls/fix_api_faild_always_show_loading 
Fix always show loading indicator when call API failed;Z-Index issue in repository detail page when event popup widget open;Wrong robot token expiration in system settings when call API failed;UI hangs at deleting when to delete OIDC user
 2019-05-08 22:40:23 +08:00
Qian Deng
d0e5936665 Fix chart storage keyfile issue in gcs 
Add volumn binding on docker-compose.yml

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-05-08 19:20:36 +08:00
Wang Yan
095f7b2ff7
add scan all and gc schedule migration (#7628) 
* add scan all and gc schedule migration

Signed-off-by: wang yan <wangyan@vmware.com>

* Fix gofmt errors

Signed-off-by: wang yan <wangyan@vmware.com>

* Update code according to review comments

Signed-off-by: wang yan <wangyan@vmware.com>

* remove convertschedule return name just return value

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-05-08 19:11:33 +08:00
Wenkai Yin
6e07a62fe1 Fix #7579: cannot stop the execution during the initialization stage (#7721) 
Fix #7579: cannot stop the execution during the initialization stage

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-05-08 19:11:18 +08:00
Daniel Jiang
f2abfcb598
Merge pull request #7724 from reasonerjt/logger-more-info 
print more sectors of file path in logger
 2019-05-08 18:28:52 +08:00
Qian Deng
3550e2eb23
Merge pull request #7624 from ninjadq/prepare_for_harbor_tile 
Prepare for harbor tile
 2019-05-08 17:45:38 +08:00
Fangyuan Cheng
7810c05fe3
Merge pull request #7697 from pureshine/fix-tooltip 
Fix the cron tooltip in replication is not fully displayed in Firefox.
 2019-05-08 17:26:20 +08:00
Steven Zou
b664b90b86
Merge pull request #7585 from steven-zou/add_get_jobs_API 
add get jobs API to provide powerful job stats management
 2019-05-08 17:17:33 +08:00
FangyuanCheng
5c12da4235 Fix filter will always show loading when call API failed 
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
 2019-05-08 16:47:11 +08:00
Wenkai Yin
c557cb3ef3
Merge pull request #7667 from ywk253100/190507_dockerhub_ut 
Add more unit test cases for docker hub adapter
 2019-05-08 16:35:06 +08:00
Yogi_Wang
fe85d23a90 Merge branch 'master' of https://github.com/goharbor/harbor into fix_api_faild_always_show_loading 2019-05-08 16:33:01 +08:00
Yogi_Wang
03ffe4fade Fix question of Cancel of OIDC configuration does not work 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-05-08 16:26:22 +08:00
Daniel Jiang
658597b255
Merge pull request #7703 from reasonerjt/update-migrator-rm-mysql 
Update migrator to support only from >=v1.6.0
 2019-05-08 16:11:55 +08:00