Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-06 02:31:06 +01:00
Code Issues Projects Releases Wiki Activity
9,837 Commits 50 Branches 312 Tags 348 MiB
b0877327c7
Commit Graph

9837 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qian Deng
b0877327c7
Merge pull request #12998 from ninjadq/fix_upgrade_trivy_2_1 
Fix trivy setting in upgrading script
 2020-09-08 17:27:23 +08:00
DQ
0e0e7afce0 Fix trivy setting in upgrading script 
Signed-off-by: DQ <dengq@vmware.com>
 2020-09-08 15:52:49 +08:00
Wenkai Yin(尹文开)
2326899518
Merge pull request #12994 from heww/cherry-pick-fix-issue-12968 
[Cherry pick]fix(project): change to use user id to query projects of member
 2020-09-08 10:20:08 +08:00
Will Sun
c22a47a864
Merge pull request #12991 from AllForNothing/release-2.1.0 
[Cherry-pick]Fix UI issues found on testing day
 2020-09-08 01:11:43 +08:00
Steven Zou
4223f38bb0
Merge pull request #12917 from chlins/cherry-pick/project-deletion-needs-delete-preheat-policy 
[CHERRY-PICK]fix(p2p): delete all preheat policies before delete project
 2020-09-07 18:14:55 +08:00
He Weiwei
33d5f0945b fix(project): change to use user id to query projects of member 
We know the user id when query projects by member, so use the user id
as entity_id directly in project_member, no need to join harbor_user
table.

Closes #12968

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-09-07 08:19:27 +00:00
AllForNothing
cdd54944ec Fix UI issues found on testing day 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-07 13:33:00 +08:00
He Weiwei
55148facf1
Merge pull request #12990 from heww/cherry-pick-ignore-enable-content-trust-for-proxy-cache 
[Cherry pick]feat(project): ignore enable_content_trust for proxy project
 2020-09-07 12:42:51 +08:00
He Weiwei
b0f807ecea
Merge pull request #12966 from heww/cherry-pick-to-fix-12938 
[Cherry pick]fix(scanner): move RemoveImmutableScanners before EnsureScanners
 2020-09-07 12:26:57 +08:00
chlins
86bc64a7f1 fix(p2p): delete all preheat policies before delete project 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-09-07 12:14:21 +08:00
Wang Yan
7fe1df22ef
fix gc log issue (#12969) 
1, Do not log redis url, just log the user input from UI.
2, Format the artifact trash items.

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

fix
 2020-09-07 12:02:42 +08:00
He Weiwei
d6d793166e feat(project): ignore enable_content_trust for proxy project 
Ignore enable_content_trust metadata for proxy cache project, see
https://github.com/goharbor/harbor/issues/12940 to get more info

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-09-07 03:52:32 +00:00
He Weiwei
e9cbfd4594 fix(scanner): move RemoveImmutableScanners before EnsureScanners 
RemoveImmutableScanners may delete the default scanner, so move it
before the EnsureScanners.

Closes #12938

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-09-07 03:30:52 +00:00
Daniel Jiang
dd47079c3c
Merge pull request #12987 from reasonerjt/session-user-id-2.1 
[CherryPick - 2.1] Store User ID in session instead of the whole user model
 2020-09-07 11:21:09 +08:00
Wenkai Yin(尹文开)
70488884d8
Merge pull request #12954 from ywk253100/200902_replication_2.1 
[cherry-pick-2.1]retry several times when failed to copy blob during the replication
 2020-09-07 11:01:45 +08:00
Wenkai Yin
65d658a059 retry several times when failed to copy blob during the replication 
Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-09-07 10:09:11 +08:00
Daniel Jiang
a569791325 Store User ID in session instead of the whole user model 
This commit makes a change so that the user id will be stored in sessoin
after user login instead of user model to avoid data inconsistency when
user model changes.

Fixes #12934

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-09-07 03:07:57 +08:00
Daniel Jiang
7bcfb502d2
Merge pull request #12973 from reasonerjt/content-trust-check-tag-2.1 
Check the tag in isArtifactSigned func -- cherrypick to 2.1
 2020-09-06 13:38:48 +08:00
Qian Deng
a8f0dc0aeb
Merge pull request #12979 from danfengliu/fix-ci-python-package-installation-issue-in-2.1 
Merge pull request #12965 from danfengliu/cherry-pick-2.1.0-fix-git-a…
 2020-09-05 17:32:39 +08:00
Daniel Jiang
a6cc336383 Check the tag in isArtifactSigned func 
This commit ensures that when CLI is pulling a tag, the content trust middleware check the data in notary to ensure the particular tag is signed, not only the digest.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-09-05 17:01:37 +08:00
stonezdj(Daojun Zhang)
c3c4a5ef6c Merge pull request #12965 from danfengliu/cherry-pick-2.1.0-fix-git-action-ci-missing-site-packages-issue 
Fix git action CI missing python sit packages issue
 2020-09-03 20:50:16 +08:00
stonezdj(Daojun Zhang)
4cf6e5ca50
Merge pull request #12965 from danfengliu/cherry-pick-2.1.0-fix-git-action-ci-missing-site-packages-issue 
Fix git action CI missing python sit packages issue
 2020-09-03 19:44:29 +08:00
danfengliu
cb2296f7d8 Fix git action CI missing python sit packages issue 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-03 17:39:50 +08:00
Daniel Jiang
58f8e6d305
Return basic auth challenge for /v2/_catalog (#12958) 
Fixes #12192

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-09-03 11:31:40 +08:00
danfengliu
6371ba2e79
Merge pull request #12949 from danfengliu/cherry-pick-to-2.1-fix-swagger-package-missing-issue 
Fix issue of missing swagger package for python API test
 2020-09-02 18:09:24 +08:00
danfengliu
d36400efa6 Fix issue of missing swagger package for python API test 
1. Python API test can't import packages from swagger maker, the reason is that python install packages to site-packages instead of dist-packages,
   so the current solution is to copy pakages from site back to dist, I will try to find a way of using ENV variable to fix this;

2. Remove a python library no longer be used.

Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-02 16:49:45 +08:00
Steven Zou
1e337a6fea
Merge pull request #12907 from steven-zou/cherry-pick/preheat-job-fix 
[CHERRY-PICK]fix(preheat):handle fail case of preheat in job
 2020-08-31 14:46:42 +08:00
Steven Zou
3e291c4ef6 fix(preheat):handle fail case of preheat in job 
Signed-off-by: Steven Zou <szou@vmware.com>
 2020-08-28 18:05:21 +08:00
Wenkai Yin(尹文开)
560eba7bd1
Merge pull request #12894 from stonezdj/200827_dockerhub_offline 
Fallback to local repo on errors when proxy to remote repo
 2020-08-28 15:14:21 +08:00
danfengliu
fb23db395c
Merge pull request #12868 from danfengliu/add-p2p-preheat-ui-test 
Add P2P Preheat UI Test
 2020-08-28 14:53:43 +08:00
He Weiwei
14f2d5e167
Merge pull request #12865 from heww/gen-apis-mocks-doc 
docs: add doc for gen apis and mocks
 2020-08-28 14:42:46 +08:00
Daniel Jiang
1b8bec3994
Merge pull request #12896 from wy65701436/fixes-12889 
fix migration issue
 2020-08-28 14:16:21 +08:00
danfengliu
00180b2a6f Add P2P Preheat UI Test 
1. Fix ldap script issue, test case name should be in lowercase;
2. Add manifest list checkout point for proxy cache issue;
3. Add P2P Preheat policy CRUD Test.

Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-08-28 11:34:32 +08:00
He Weiwei
687043c298
Merge pull request #12880 from stefannica/use-exit-in-db-entrypoint 
Use exec in harbor database entrypoint
 2020-08-28 10:09:58 +08:00
Wenkai Yin(尹文开)
3abe8b8fab
Merge pull request #12456 from julienvey/fix-sql-typo 
Fix typo in sql log
 2020-08-28 10:04:27 +08:00
Wenkai Yin(尹文开)
bad704d38b
Merge pull request #12897 from reasonerjt/icon-refactor 
Fill in the icon of known artifacts in artifact controller
 2020-08-28 10:03:12 +08:00
Daniel Jiang
91e2779822 Fill in the icon of known artifacts in artifact controller 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-08-28 01:33:26 +08:00
Ziming Zhang
bda66e9e1f Add aws China regions ECR support, both of cn-north-1 and cn-northwest-1 endpoints. 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2020-08-27 23:43:16 +08:00
stonezdj
6967d73476 Fallback to local repo on errors when proxy to remote repo 
When the remote repo is offline or network issue or credential issue, fall back to local repo.
 Fixes #12853

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2020-08-27 22:10:54 +08:00
wang yan
84094e7a5d fix migration issue 
fixes #12889

Before the migration script to fix the nativate repo_id issue, is has to remove the duplicate tags
from the tag table, which may caused by user in v2.0.2 to retag & repush the missing image.

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-08-27 19:04:39 +08:00
Daniel Jiang
a651eb0949
Merge pull request #12883 from wy65701436/fixes-12254 
fix event log issue
 2020-08-27 16:52:24 +08:00
Daniel Jiang
287b0f2c83
Merge pull request #12886 from reasonerjt/sql-idempotent-2.1 
Make the 2.1.0 migration SQL script idempotent
 2020-08-26 23:58:05 +08:00
wang yan
b51aaac26e fix event log issue 
fixes #12554
Add string method for each event, and the detail can be logged in the core.log

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-08-26 18:27:21 +08:00
Daniel Jiang
7b42defb9a Make the 2.1.0 migration SQL script idempotent 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-08-26 16:50:25 +08:00
He Weiwei
815ab61bc6
Merge pull request #12881 from heww/operator-from-security-username 
refactor(event): change default operator to username of security
 2020-08-26 15:42:36 +08:00
Ziming Zhang
c3fde4e483 fix(replication) gcr deletion and tag deletion 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2020-08-26 15:18:05 +08:00
Daniel Jiang
37e0aa0798
Merge pull request #12873 from wy65701436/fixes-12827 
fix db migration issue
 2020-08-26 14:42:24 +08:00
He Weiwei
793c5ca57b refactor(event): change default operator to username of security 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-08-26 05:52:02 +00:00
wang yan
9822e5bb15 fix db migration issue 
fixes #12827
 After user migrates Harbor from v2.0.2, user got 404 when to pull specific images, and no work after push the same images again.

 Fix:
 1, If the issue is caused by missing repository data, this fix can revert the missing repository data and all things should be fine.
 2, If the issue is caused by missing blob data, this fix can revert the missing repository data and still left the media type of artifact
    as 'UNKNOWN', which leads the meta data and build history of the image cannot be shown in UI. User can delete and push the image again to
    resolve it.

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-08-26 12:02:20 +08:00
Steven Zou
87d18268e0
Merge pull request #12879 from kofj/fix_schedule_error_msg 
Fix schedule error msg.
 2020-08-26 11:04:10 +08:00