Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-29 21:54:13 +01:00
Code Issues Projects Releases Wiki Activity
7,535 Commits 53 Branches 317 Tags 335 MiB
3144635ea1
Commit Graph

7535 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
danfengliu
5c8890bc6d Replace image from httpd to haproxy:1.5 to make sure serverity is stable for test. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-09-03 14:04:59 +08:00
Wang Yan
4d5e549731
Merge pull request #8904 from danfengliu/Add-ECR-And-GCR-registry-to-nightly-replication-tests 
Add AWS-ECR and Google-GCR replication test into nighly tests.
 2019-09-03 13:38:57 +08:00
Daniel Jiang
b75cbe1a7e
Merge pull request #8912 from ninjadq/no_cache_index_html 
Add no-cache to index.html
 2019-09-03 13:01:55 +08:00
Will Sun
cf1b7cbc41
Merge pull request #8916 from AllForNothing/nightly 
fix add-member nightly case failure
 2019-09-03 11:27:05 +08:00
Qian Deng
97c40df40f
Merge pull request #8593 from ninjadq/fix_wording_in_doc 
Update config file names
 2019-09-03 10:53:23 +08:00
jwangyangls
1165bd6d0c
Merge branch 'master' into log_bugs 2019-09-03 10:45:58 +08:00
Wang Yan
2194834b41
Merge pull request #8910 from heww/foreign-layers 
fix(quota): correct size quota for image with foreign layers
 2019-09-03 00:29:24 +08:00
Wang Yan
fd4c259821
Merge pull request #8919 from wy65701436/fix-setresusage-outofrange 
fix int out of range when to set usage in GC job
 2019-09-02 23:34:46 +08:00
He Weiwei
f44b75f398 fix(quota): correct size quota for image with foreign layers 
1. Sync blobs from manifest for image with foreign layers.
2. Ignore size of foreign layers when compute size quota.
3. Fix repo info of artifact when upgrade from 1.8 version.

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-09-02 14:10:58 +00:00
wang yan
d3f7d01a69 fix int out of range when to set usage in GC job 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-09-02 18:48:10 +08:00
DQ
d50df0f0db Add no-cache to index.html 
shouldn't cache index.html for access fresh page after upgrade.

Signed-off-by: DQ <dengq@vmware.com>
 2019-09-02 18:48:02 +08:00
Wenkai Yin(尹文开)
7d151946e0
Merge pull request #8917 from reasonerjt/fix-create-admin-user 
Disallow creating an admin user when registration
 2019-09-02 18:43:41 +08:00
DQ
aef93af21f Fix docker-compose version to 1.18.0 
Signed-off-by: DQ <dengq@vmware.com>
 2019-09-02 18:37:42 +08:00
DQ
377739204b Update config file names 
Signed-off-by: DQ <dengq@vmware.com>
 2019-09-02 18:19:06 +08:00
stonezdj(Daojun Zhang)
469018ae9e
Merge pull request #8891 from ninjadq/fix_prepare_file_permission 
Fix: prepare permission issue
 2019-09-02 18:07:14 +08:00
danfengliu
7d681c623b Add AWS-ECR and Google-GCR replication test into nighly tests. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-09-02 17:53:49 +08:00
sshijun
aab50ab642 fix add-member nightly case failure 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-09-02 17:10:25 +08:00
Wenkai Yin(尹文开)
d762e0730a
Merge pull request #8843 from heww/fix-chart-builder 
fix(chart,quota): fix path regexp of chart creation and deletion
 2019-09-02 15:59:18 +08:00
Qian Deng
f12a45b1aa
Merge pull request #7895 from ninjadq/fix_file_permission 
Fix docker-compose file permmission
 2019-09-02 15:13:18 +08:00
Qian Deng
86f2bb26a3 Fix docker-compose file permmission 
non-root user can see the content

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-09-02 13:57:18 +08:00
Daniel Jiang
1a57f67413
Merge pull request #8907 from airadier/handle-error-on-oidc-callback 
Handle error on OIDC callback
 2019-09-02 13:36:11 +08:00
Will Sun
33eaf37edf
Merge pull request #8890 from AllForNothing/imp-validator 
fix UI bug for tag-retention and project-quota
 2019-09-02 10:21:16 +08:00
Qian Deng
530240d8a3
Merge pull request #8897 from danfengliu/add-a-cve-id-to-add-system 
Fix nightly case to handle new vuln found by Clair.
 2019-09-02 10:10:41 +08:00
DQ
6ed3d52615 Fix: prepare permission issue 
1. recursivele change ownership for all prepare dir
2. database file permission fix

Signed-off-by: DQ <dengq@vmware.com>
 2019-09-02 10:04:38 +08:00
xaleeks
8fd8c5f345
Merge pull request #8515 from ruzickap/patch-1 
Typo fix in en-us-lang.json
 2019-09-01 18:27:30 +08:00
Wang Yan
6e462baa0d
Merge pull request #8837 from ninjadq/disable_redis_n_db_container_if_use_exeternal 
Disable redis and db containers if external db enabled
 2019-09-01 17:47:28 +08:00
Daniel Jiang
6f0b376d07
Merge pull request #7913 from torubylist/master 
fix small typo
 2019-09-01 17:24:09 +08:00
xaleeks
20383611f9 added description of master role 
Signed-off-by: xaleeks <xalex@vmware.com>
 2019-08-31 01:30:39 +08:00
Iradier, AlvaroJose
bf9ac08c89 Handle error on OIDC callback 
If wrong OIDC scopes are defined, or there are some configuration errors, the OIDC callback query string might contain "error=..." with an error message. Intercept this case and show an error to the user instead of trying to exchange the token with a missing "code" parameter.

Signed-off-by: Iradier, AlvaroJose <AlvaroJose.Iradier@adidas.com>

Change error variable name

Signed-off-by: Iradier, AlvaroJose <AlvaroJose.Iradier@adidas.com>
 2019-08-30 13:44:12 +02:00
Daniel Jiang
93f86e321b
Merge pull request #8903 from wy65701436/fix-8807 
fix #8807
 2019-08-30 18:23:05 +08:00
Wenkai Yin(尹文开)
8c67f71b5e
Merge pull request #8902 from wy65701436/fix-8888 
fix #8888
 2019-08-30 18:09:56 +08:00
wang yan
c28920c84f fix #8807 
Format the error of mount blob, return a http error so that the core can parse it.

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-30 16:29:47 +08:00
xiaorui.zou
a727915fde fix portal Chinese translate 
Signed-off-by: xiaorui.zou <zourui@mskj.com>
Signed-off-by: xiaorui.zou <xiaorui.zou@gmail.com>
 2019-08-30 15:33:08 +08:00
wang yan
dd9f028fe0 fix #8888 
the image may has the same blobs as the references, which causes the artifact & blobs
can not be inserted by unique constraint

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-30 15:30:05 +08:00
Wang Yan
240b718508
Merge pull request #8887 from wy65701436/fix-8886 
fix(quota/sync) #8886
 2019-08-30 15:06:35 +08:00
Daniel Jiang
fb56951259
Merge pull request #8898 from bitsf/tag_retention_fix 
tag retention fix duration and show trigger
 2019-08-30 13:57:34 +08:00
AllForNothing
f597b89100 fix UI bug for tag-retention and project-quota 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2019-08-30 13:34:37 +08:00
Ziming Zhang
22e7f22b30 tag retention fix duration and show trigger 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I7f93dd4c1b93b8d7e6b2c2a14fd4ccf128945def
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-08-30 11:48:11 +08:00
Wenkai Yin(尹文开)
881884786d
Merge pull request #8883 from bitsf/tag_retention_log 
enhance tag retention log
 2019-08-30 10:48:01 +08:00
Daniel Jiang
ade11dd59d
Merge pull request #8882 from bitsf/tag_retention_rbac 
verify permission of GetRetentionExecTaskLog
 2019-08-30 10:34:09 +08:00
danfengliu
68fd128252 Clair scan result is not accurate that when I script this case, only 6 high CVE-ID, but in today nightly result, one more CVE-ID popuped, so I have to add it. 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2019-08-30 09:55:55 +08:00
xaleeks
010096c897 changed user_guide.md 
Signed-off-by: xaleeks <xalex@vmware.com>
 2019-08-29 18:47:37 +08:00
Ziming Zhang
247ef1b884 enhance tag retention log 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Id5946c2dd53868fdd5f5abbcca45e453bc9ba4fd
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-08-29 18:40:00 +08:00
wang yan
16b910e1cf fix(quota/sync) #8886 
The foreign layer won't be counted into project quota
NOTE: the foreign layer will be dumped from the registry in the migration

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-29 17:29:40 +08:00
He Weiwei
e2a19d8ab9
fix(build): max idle and open conn settings for external db (#8854) 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-08-29 15:04:10 +08:00
Ziming Zhang
8fb6e2f65b verify permission of GetRetentionExecTaskLog 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I4bf4ddf3d3ed6f07a4618e242e2f3774996716d6
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-08-29 15:01:53 +08:00
Wang Yan
db5781bf78
Merge pull request #8860 from wy65701436/fix-quota-sync 
fix quota sync issues
 2019-08-29 13:45:38 +08:00
wang yan
5decb56369 update code per review comments 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-29 12:46:42 +08:00
Wang Yan
03309680ff
Merge pull request #8873 from bitsf/tag_retention_log_time 
show empty if time is 0
 2019-08-29 12:39:22 +08:00
Daniel Jiang
9fa70db866
Merge pull request #8867 from bitsf/tag_retention_same_digest_tag 
Tag retention same digest tag
 2019-08-29 12:26:44 +08:00