Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-20 01:05:19 +01:00
Code Issues Projects Releases Wiki Activity
6,876 Commits 53 Branches 317 Tags 352 MiB
9c9b8d3a6d
Commit Graph

6876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
He Weiwei
9c9b8d3a6d Merge branch 'master' into project-quota-dev 2019-07-19 10:02:51 +08:00
Will Sun
6f62a44a17
Merge pull request #8328 from AllForNothing/cve-link 
The item in CVE whiltelist should be a click-able link
 2019-07-18 17:22:21 +08:00
AllForNothing
4979c4a49c The item in CVE whiltelist should be a click-able link 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-07-18 16:17:43 +08:00
Wang Yan
04d63f887d
Merge pull request #8324 from ninjadq/ci_build_prepare_locally 
Travis ci build prepare container in local
 2019-07-18 15:14:10 +08:00
DQ
5adc29c07f Travis ci build prepare container in local 
build prepare container before running ut case

Signed-off-by: DQ <dengq@vmware.com>
 2019-07-18 14:46:05 +08:00
Daniel Jiang
e0e6a1d30b
Merge pull request #8301 from ninjadq/external_endpoint_support 
Add supoort for external endpoint
 2019-07-18 01:36:08 +08:00
Qian Deng
739b4723db
Merge pull request #8308 from ninjadq/upgrade_chartmuseum_2_v0_9_0 
Upgrade chartmuseum from v0.8.1 to v0.9.0
 2019-07-17 16:48:52 +08:00
danfengliu
554b0771fe
Due to adding new feature for white list, xpath of configuration changed, it caused failure of nightly tests, so it should be fixed. (#8307) 
Signed-off-by: Danfeng Liu (c) <danfengl@vmware.com>
 2019-07-17 16:46:26 +08:00
DQ
6cf4596292 Add supoort for external endpoint 
Add config item in harbor.yml
Make fowarding rule configurable

Signed-off-by: DQ <dengq@vmware.com>
 2019-07-17 16:23:37 +08:00
Wang Yan
4cdb6fb975
Merge pull request #8239 from bitsf/fix_replication_dockerhub_tls 
fix replication dockerhub skip tls
 2019-07-17 15:35:29 +08:00
danfengliu
9b61bf4fce
In nightly test case 'list helm chart', delete chart (#8280) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-07-17 15:32:10 +08:00
Wenkai Yin(尹文开)
a64e089773
Merge pull request #8210 from stonezdj/http_group_dao2 
Add HTTP group support
 2019-07-17 15:22:36 +08:00
Qian Deng
5cd3594f20 Upgrade chartmuseum from v0.8.1 to v0.9.0 
Signed-off-by: Qian Deng <dengqian0826@gmail.com>
 2019-07-17 06:45:23 +00:00
Wang Yan
31c3413ddf
Merge pull request #8288 from wy65701436/mf-workflow-base 
Add quota workflow for manifest
 2019-07-17 11:25:30 +08:00
Will Sun
8ea339f882
Merge pull request #8297 from AllForNothing/cve-whitelist 
modify UT for cve-whitelist UI
 2019-07-16 17:14:08 +08:00
stonezdj
bb2ae7c093 Add HTTP group feature 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-07-16 15:38:46 +08:00
Shijun Sun (c)
140a3da238 modify UT for cve-whitelist UI 
Signed-off-by: Shijun Sun (c) <sshijun@vmware.com>
 2019-07-16 15:24:15 +08:00
wang yan
105518fe12 Merge branch 'master' of https://github.com/goharbor/harbor into project-quota-dev 2019-07-16 14:51:37 +08:00
Wang Yan
8ac6bdbbb0 Add quota workflow for quota 
1, apply count for manifest if it's a new image
2, insert data for artifact and artifact_blob

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-16 14:48:05 +08:00
danfengliu
a8300d91e6
Add a nightly test case helm CLI, in this case, we verify help repo add and helm push. (#8240) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-07-16 14:00:30 +08:00
Will Sun
3cfb626b0d
Merge pull request #8245 from AllForNothing/cve-whitelist 
Cve whitelist
 2019-07-15 21:22:13 +08:00
Shijun Sun (c)
274ab7bcff add CVE-Whitelist 
Signed-off-by: Shijun Sun (c) <sshijun@vmware.com>
 2019-07-15 19:47:46 +08:00
De Chen
b7123cd4c2
Merge pull request #8171 from rvanbutselaar/prepare_selinux 
Add SELinux label to all volumes inside prepare script
 2019-07-15 13:48:24 +08:00
wang yan
f066d986b9 merge with latest master code 2019-07-11 20:21:15 +08:00
Wang Yan
b98ca7bf0b
Merge pull request #8237 from wy65701436/redis-locker 
add redis lock
 2019-07-11 20:10:16 +08:00
wang yan
ef14f0cf35 add redis lock, it will be used to lock digest in the quota scenario 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-11 19:24:24 +08:00
Wenkai Yin(尹文开)
3bebf7bc64
Merge pull request #8238 from reasonerjt/project-cve-whitelist 
Enable project level CVE whitelist
 2019-07-10 14:41:01 +08:00
jwangyangls
432f08b5b5
Merge pull request #8241 from jwangyangls/fixReplicationLabelFilterbug 
Fix bug when no labels
 2019-07-10 14:38:51 +08:00
jwangyangls
c73fa851ff
Merge pull request #8221 from jwangyangls/addGroupInhttpMode 
Add user group when http auth mode
 2019-07-10 14:38:31 +08:00
Yogi_Wang
6ef82d4db9 Fix bug when no labels 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-07-10 13:02:34 +08:00
Wang Yan
155b0b0acd
Merge pull request #8175 from heww/quota-manager 
Add manager for quota
 2019-07-10 11:03:57 +08:00
wang yan
6d0271ee5c Merge branch 'master' of https://github.com/goharbor/harbor into project-quota-dev 2019-07-10 10:57:10 +08:00
He Weiwei
41ba410bb2 Manager for quota 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-07-09 13:59:48 +08:00
Wang Yan
7fd0bbcbd2
Merge pull request #8230 from wy65701436/dao-artifact 
add dao of artifact
 2019-07-09 13:44:05 +08:00
Wang Yan
5660e5512b
Merge pull request #8206 from wy65701436/project-quota-yan-linux 
Refactor interceptors code with chain
 2019-07-09 13:29:18 +08:00
wang yan
c8a39c88a0 Merge branch 'project-quota-dev' of https://github.com/goharbor/harbor into project-quota-yan-linux 2019-07-09 11:12:23 +08:00
wang yan
7b38389898 update codes per review comments 
Signed-off-by: wang yan <wangyan@vmware.com>

fix middlewares per review comments
1, add scheme1 and scheme2 check
2, change MustCompile to Compile

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-09 11:08:19 +08:00
wang yan
b3c5137a2f add copyright and fix codecy 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-09 11:08:19 +08:00
wang yan
57821b1b4c Refactor interceptors code with chain 
1, add a blob inteceptors for quota usage
2, add a manifest inteceptors for quota usage

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-09 11:08:11 +08:00
wang yan
0011331546 merge with latest code 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-08 23:44:37 +08:00
wang yan
24c3753581 add dao of artifact 
Signed-off-by: wang yan <wangyan@vmware.com>

Add dao for quota

Signed-off-by: He Weiwei <hweiwei@vmware.com>

fix govet

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-08 23:42:50 +08:00
Daniel Jiang
8f5f0031c7 Enable project level CVE whitelist 
This commit update the project API to support "reuse_sys_cve_whitelist"
setting in project metadata and "cve_whitelist" in project request.
Also modify the interceptor to support project level CVE whitelist if
the reuse flag is false.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-07-08 18:55:54 +08:00
Yogi_Wang
c57087574a Add user group when http auth mode 
add the pages  in project and system

Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-07-08 17:28:38 +08:00
Ziming Zhang
0691a5ad9c fix replication dockerhub tls skip tls 
Change-Id: I9584d89cf9bda2b782b0fd556450a81be0fc7510
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-07-08 08:17:26 +00:00
danfengliu
fa51ac6406
Add user027 and user028 to ldap service, it was added in ldap_test.ldif for nightly test. (#8158) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-07-08 15:30:08 +08:00
danfengliu
db012c816d
In nightly test case <Delete Multi Member>, 'action' was clicked, but the dropdown list was't not shown up, so we should add a comfirmation to make sure the expected element show up. (#8146) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-07-08 15:28:28 +08:00
Wenkai Yin(尹文开)
5f9420a5a7
Merge pull request #8190 from ywk253100/190701_replication 
Merge Default ImageRegistry into the native adapter to reduce the duplicate code
 2019-07-08 12:47:55 +08:00
Daniel Jiang
c296f0ddfb
Merge pull request #8176 from stonezdj/http_group 
Refactor LDAP usergroup
 2019-07-08 09:54:31 +08:00
wang yan
a95f8c556d Merge branch 'master' of https://github.com/goharbor/harbor into project-quota-dev 2019-07-05 15:49:17 +08:00
stonezdj
c0ed55445d Refactor LDAP group 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-07-05 14:44:18 +08:00