stonezdj(Daojun Zhang)
09bb364b68
Merge pull request #8948 from reasonerjt/empty-project-cve-item-list
...
The default item list should be empty list,not null
2019-09-04 18:49:45 +08:00
Daniel Jiang
76a79869df
The default item list should be empty list,not null
...
This commit make sure that the "items" in response of project level
CVE_whitelist is not null, even when it's null in the DB the API will
return an empty list
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2019-09-04 17:59:56 +08:00
Daniel Jiang
250a53cad7
Merge pull request #8908 from xaleeks/xaleeks-master-role-to-user-guide
...
Xaleeks master role to user guide
2019-09-04 16:41:50 +08:00
He Weiwei
e6ea40c04c
docs(swagger): add Products tag for quota APIs ( #8937 )
...
Signed-off-by: He Weiwei <hweiwei@vmware.com>
2019-09-04 16:34:34 +08:00
danfengliu
ed67e44d34
Merge pull request #8944 from danfengliu/projectname-conflict-in-case-wl-add-system-and-prepare-case-sensitive
...
Add CVE white list API test into API_DB.robot and some other modification
2019-09-04 16:31:00 +08:00
danfengliu
8503957eac
1.Add CVE white list API test into API_DB.robot;2.Random data for prject name should use lower case %m%s;3.Replace from harbor to self.
...
Signed-off-by: danfengliu <danfengl@vmware.com>
2019-09-04 15:50:09 +08:00
Will Sun
697ec2a52f
Merge pull request #7952 from qiqizjl/log_bugs
...
Fix some bugs in the Log page
2019-09-04 10:10:28 +08:00
gklp
dee3defeff
refactored
...
Signed-off-by: gklp <gokalpkuscu@gmail.com>
2019-09-03 21:46:52 +03:00
gklp
44a9e5d127
All redirect operations should have content-type as json
...
Signed-off-by: gklp <gokalpkuscu@gmail.com>
2019-09-03 21:46:52 +03:00
danfengliu
5ab626963d
Merge pull request #8928 from danfengliu/add-sha256-to-case-Project-Level-Image-Serverity-Policy-and-replace-image-for-wl-add-system
...
Replace image from httpd to haproxy:1.5 for CVE whitelist test
2019-09-03 18:21:11 +08:00
Wang Yan
b844443509
Merge pull request #8929 from wy65701436/read-only-sync
...
add read only for quota switcher
2019-09-03 15:58:13 +08:00
Wang Yan
ea3c9aa70e
Merge pull request #8931 from wy65701436/doc-update
...
add harbor components version and gosec checking in drone ci
2019-09-03 15:37:39 +08:00
wang yan
8e3d4cdc90
add harbor components version and gosec checking in drone ci
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-09-03 14:46:25 +08:00
wang yan
d8e17b122e
add read only for quota switcher
...
Signed-off-by: wang yan <wangyan@vmware.com>
2019-09-03 14:08:39 +08:00
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