Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-18 14:47:38 +01:00
Code Issues Projects Releases Wiki Activity
9,842 Commits 56 Branches 319 Tags 338 MiB
1369089603
Commit Graph

9842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Qian Deng
1369089603
Merge pull request #13001 from ninjadq/fix_upgrade_trivy 
Fix trivy setting in upgrading script
 2020-09-08 18:59:30 +08:00
DQ
17f3bfccb4 Fix trivy setting in upgrading script 
Signed-off-by: DQ <dengq@vmware.com>
 2020-09-08 18:15:57 +08:00
Daniel Jiang
513c48d47c
Merge pull request #12936 from wy65701436/fix-swagger-dep 
remove the dependency on swagger models
 2020-09-08 18:14:42 +08:00
Will Sun
5586fe86bf
Merge pull request #12988 from AllForNothing/test-4 
Fix UI issues found on testing day
 2020-09-08 01:12:10 +08:00
He Weiwei
8c2922860c
Merge pull request #12993 from heww/fix-issue-12968 
fix(project): change to use user id to query projects of member
 2020-09-07 16:13:56 +08:00
Daniel Jiang
efa34342af
Merge pull request #12964 from wy65701436/remove-tri-sec 
remove the secret file of travis
 2020-09-07 15:05:35 +08:00
He Weiwei
6d50988c8b 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 06:35:26 +00:00
AllForNothing
3fa3e14bb6 Fix UI issues found on testing day 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-07 12:50:48 +08:00
wang yan
827158badc Merge branch 'master' of https://github.com/goharbor/harbor into remove-tri-sec 2020-09-07 11:57:22 +08:00
Daniel Jiang
6fc0c9d75a
Store User ID in session instead of the whole user model (#12984) 
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 11:43:37 +08:00
stonezdj(Daojun Zhang)
4267570e99
Merge pull request #12960 from heww/ignore-enable-content-trust-for-proxy-cache 
feat(project): ignore enable_content_trust for proxy project
 2020-09-07 11:25:53 +08:00
danfengliu
7cc3d7f81e
Merge pull request #12978 from danfengliu/fix-ci-python-package-installation-issue 
Fix git action CI python package installation
 2020-09-06 20:02:17 +08:00
Daniel Jiang
062600ef6f
Merge pull request #12972 from reasonerjt/content-trust-check-tag 
Check the tag in isArtifactSigned func
 2020-09-06 13:38:32 +08:00
Daniel Jiang
2f7c8c2abd 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:00:55 +08:00
danfengliu
34e2490154 Fix git action CI python package installation 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-03 20:41:55 +08:00
stonezdj(Daojun Zhang)
316f03492f
Merge pull request #12963 from danfengliu/fix-git-action-ci-missing-site-packages-issue 
Fix git action CI missing python sit packages issue
 2020-09-03 19:48:48 +08:00
danfengliu
2ca5c11675 Fix git action CI missing python sit packages issue 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-03 17:34:51 +08:00
Chlins Zhang
0465ad733f
Merge pull request #12916 from chlins/fix/project-deletion-needs-delete-preheat-policy 
fix(p2p): delete all preheat policies before delete project
 2020-09-03 17:32:20 +08:00
wang yan
8384f5f39c remove the secret file of travis 
The secret file is used for the travis CI, depreciate it as the travis is not used anymore.

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-09-03 13:36:40 +08:00
Wang Yan
088d1e7fb9
bump up base version to 2.2 (#12914) 
Signed-off-by: wang yan <wangyan@vmware.com>
 2020-09-03 13:12:45 +08:00
Daniel Jiang
66c3fa9eec
Return basic auth challenge for /v2/_catalog (#12956) 
Fixes #12192

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-09-03 11:31:57 +08:00
He Weiwei
f4938ca966
fix(scanner): move RemoveImmutableScanners before EnsureScanners (#12957) 
RemoveImmutableScanners may delete the default scanner, so move it
before the EnsureScanners.

Closes #12938

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-09-03 11:11:16 +08:00
He Weiwei
41c839af88 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-02 15:24:45 +00:00
Wang Yan
262f22f5ef
fix gc log issue (#12943) 
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>
 2020-09-02 17:11:05 +08:00
stonezdj(Daojun Zhang)
05489fca1e
Merge pull request #12947 from ywk253100/200902_replication 
retry several times when failed to copy blob during the replication
 2020-09-02 17:01:52 +08:00
chlins
e01de8b201 fix(p2p): delete all preheat policies before delete project 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-09-02 16:39:51 +08:00
wang yan
a01e82d208 Merge branch 'master' of https://github.com/goharbor/harbor into fix-swagger-dep 2020-09-02 16:26:58 +08:00
Wenkai Yin
7816ff5e85 retry several times when failed to copy blob during the replication 
Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-09-02 16:07:20 +08:00
danfengliu
5c6a5b12c5
Merge pull request #12939 from danfengliu/fix-issue-of-missing-swagger-pkg-for-python 
Fix issue of missing swagger package for python API test
 2020-09-02 16:04:11 +08:00
danfengliu
931bde0df8 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 15:18:23 +08:00
wang yan
116d295462 remove the dependency on swagger models 
1, remove the pkg dependency on v2.0/server/models
2, remove the controller dependency on v2.0/server/models

Signed-off-by: wang yan <wangyan@vmware.com>
 2020-09-01 17:43:44 +08:00
Steven Zou
bc3433194b
Merge pull request #12906 from steven-zou/fix/preheat-job 
fix(preheat):handle fail case of preheat in job
 2020-08-31 11:15:15 +08:00
Steven Zou
d4108e3fac fix(preheat):handle fail case of preheat in job 
Signed-off-by: Steven Zou <szou@vmware.com>
 2020-08-28 17:55:36 +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