Commit Graph

5609 Commits

Author SHA1 Message Date
danfengliu
9265754936 modify codacy errors in target
Signed-off-by: danfengliu <danfengl@vmware.com>
2018-11-08 10:33:14 +08:00
danfengliu
a6151175e3 add lib for target
Signed-off-by: danfengliu <danfengl@vmware.com>
2018-11-08 10:33:14 +08:00
danfengliu
e6f5f62c53 Modify for codacy again
Signed-off-by: danfengliu <danfengl@vmware.com>
2018-11-08 10:33:14 +08:00
danfengliu
0b84ec84d9 Modify for codacy
Signed-off-by: danfengliu <danfengl@vmware.com>
2018-11-08 10:33:14 +08:00
danfengliu
660bfdf677 add test case of add a replication rule
Signed-off-by: danfengliu <danfengl@vmware.com>
2018-11-08 10:33:14 +08:00
Wenkai Yin
55c609b1a7 Update automation test case (#6221)
1. Add "Wait Until ..." to "Change User Role In Project"
2. Rename case name to "Scan Image On Push"

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-11-07 13:08:32 +08:00
Mia ZHOU
db3088ae4d
Merge pull request #6218 from zhoumeina/upgrade_package_version
upgrade package version to rc6
2018-11-07 12:46:40 +08:00
James Zabala
ae1196ec8a
Merge pull request #6229 from ninjadq/change_title_wording
Fix:Vmware is appeared in ihe title of loading page
2018-11-06 08:55:48 -05:00
James Zabala
a5c0e09759
Merge pull request #6206 from jeffweilee/master
Refine Configure_https.md
2018-11-06 08:55:11 -05:00
Jeff Lee Wei Che
464fa3736c Update configure_https.md
Signed-off-by: jeffweilee <jeffweilee@gmail.com>

Update configure_https.md

Signed-off-by: jeffweilee <jeffweilee@gmail.com>

Update configure_https.md

Signed-off-by: jeffweilee <jeffweilee@gmail.com>

Update configure_https.md

1. There is no need to have Getting Client Certificate Section. All we need is CA and Server Certificate.
2. Modify subtitle in Configuration and Installation:
1) Configure Server Certificate and Key for Harbor
2) Configure Server Certificate, Key and CA for Docker
3) Configure Harbor
3. Use yourdomain.com instead of reg.yourdomain.com throughout the article for better understanding.

Signed-off-by: jeffweilee <jeffweilee@gmail.com>

Update configure_https.md

1. There is no need to have Getting Client Certificate Section. All we need is CA and Server Certificate.
2. Modify subtitle in Configuration and Installation:
1) Configure Server Certificate and Key for Harbor
2) Configure Server Certificate, Key and CA for Docker
3) Configure Harbor
3. Use yourdomain.com instead of reg.yourdomain.com throughout the article for better understanding.

Signed-off-by: jeffweilee <jeffweilee@gmail.com>

rebase PR of Refine Configure_https.md

Signed-off-by: jeffweilee <jeffweilee@gmail.com>

signoff

Signed-off-by: jeffweilee <jeffweilee@gmail.com>
2018-11-06 21:10:56 +08:00
Wenkai Yin
56d57b0093
Merge pull request #6223 from reasonerjt/retry-in-webhook-handler
Wait for manifest in notification handler
2018-11-06 20:33:11 +08:00
Daniel Jiang
abe728325b Wait for manifest in notification handler
There's an issue in registry 2.6.x, that when the webhook is sent the
manifest of the image may not be written.
For details: https://github.com/docker/distribution/issues/2625

This will cause issue in "scan on push" or replication.
This commit mitigates the issue by adding retries in notification
handler.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-11-06 19:23:54 +08:00
Qian Deng
5210aecc76 Fix:Vmware is appeared in ihe title of loading page
Should change it to Harbor

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-06 19:00:46 +08:00
Wenkai Yin
4d829117de
Merge pull request #6222 from wy65701436/fix-swagger-delete
Fix issues on swagger file
2018-11-06 14:47:33 +08:00
wang yan
9105bb6641 Fix issues on swagger file
1, Add the delete of replication policy.
2, Fix Semantic error at paths./repositories/{repo_name}/tags

Signed-off-by: wang yan <wangyan@vmware.com>
2018-11-06 13:38:59 +08:00
Qian Deng
35f3346948
Merge pull request #6155 from mmpei/6086-UserNameLength
Support longer UserName
2018-11-06 10:50:50 +08:00
Meina Zhou
5143943ced upgrade package version to rc6
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-11-06 10:23:08 +08:00
Mia ZHOU
b3c22fa53a
Merge pull request #6212 from zhoumeina/refactor_systemsetting
refactor system settings and fixed bug of system settings
2018-11-06 10:11:21 +08:00
Meina Zhou
f594c44045 refactor system settings and fixed bug of system settings
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-11-06 08:43:34 +08:00
James Zabala
2e66024a78
Merge pull request #6216 from clouderati/update-owners
Updating OWNERS.md with affiliation
2018-11-05 15:29:01 -05:00
clouderati
d07968d10d Updating OWNERS.md with affiliation
Signed-off-by: clouderati <35942204+clouderati@users.noreply.github.com>
2018-11-05 15:27:33 -05:00
Wenkai Yin
8c376ac55a
Merge pull request #6205 from ywk253100/181102_case
Check the vul data before running scan-on-push case
2018-11-05 21:09:26 +08:00
Qian Deng
4ee6548e25
Merge pull request #6214 from reasonerjt/render-default-perm
Make rendered files less visible
2018-11-05 15:39:18 +08:00
Daniel Jiang
1e9b34325c Make rendered files less visible
Some configuration files and env files contain sensitive information,
they should not be readable by any user by default.

This commit updates the `prepare` script to update the mask of the
rendered files.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-11-05 15:06:00 +08:00
James Zabala
b58ff42dff
Merge pull request #6184 from wy65701436/bump-up-clair
Build clair version into clair image
2018-11-02 17:04:25 -04:00
James Zabala
792fa35b65
Merge pull request #6202 from SDBrett/changelog
Updated change log for v1.4.0 -> v1.6.0
2018-11-02 17:02:57 -04:00
danfengliu
342a1051db
Merge pull request #6197 from danfengliu/add-tc-del-label
Add test cases <add global label to a image> and <delete repository>.
2018-11-02 18:46:19 +08:00
Wenkai Yin
40f8f4bc5d Check the vul data before running scan-on-push case
Update the automation case to wait until the vul data is ready before running the scan-on-push case

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-11-02 17:54:47 +08:00
danfengliu
1979d17550 add tc add-sys-label-to-tag and del-repo
Signed-off-by: danfengliu <danfengl@vmware.com>
2018-11-02 17:16:43 +08:00
Daniel Jiang
47c882c215
Merge pull request #6203 from reasonerjt/clair-parm
Clair image should accept parms
2018-11-02 14:36:39 +08:00
Daniel Jiang
ec01a97eb8 Clair image should accept parms
Update the entrypoint to allow the image accept other parms,
to help debug in the future.

If replace "$*" with "$@" only one parm will be passed to dumbinit

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
2018-11-01 22:25:55 -07:00
Daniel Jiang
163fc11b7f
Merge pull request #6198 from ywk253100/181101_replication
Pass internal core URL as source in replication
2018-11-02 12:29:53 +08:00
Brett Johnson
6ecb19dce3 Updated change log for v1.4.0 -> v1.6.0
Signed-off-by: Brett Johnson <brett@sdbrett.com>
2018-11-02 14:44:59 +11:00
Mia ZHOU
a20d49359b
Merge pull request #6195 from pureshine/labels-btn
Ordinary user login is forbidden to add labels in images.
2018-11-02 10:03:10 +08:00
Mia ZHOU
c920b025fa fix the typpo error in nightly test case (#6200)
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-11-02 09:14:57 +08:00
FangyuanCheng
7430ae7426 Ordinary user login is forbidden to add labels in images.
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-11-01 18:15:38 +08:00
Wenkai Yin
88aa413fe6 Pass internal core URL as source in replication
Currently, we pass the external URL as the source registry and set insecure as true in replication, this causes security issue. This commit replaces the URL with the internal one and set insecure to false. Fixes #6109.

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-11-01 17:13:38 +08:00
Mia ZHOU
4894d1f46f
Merge pull request #6190 from zhoumeina/fix_nightly
fix nightly test
2018-11-01 15:16:26 +08:00
Meina Zhou
0ba9856c66 fix nightly test
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-11-01 14:07:55 +08:00
Qian Deng
e19616a99d
Merge pull request #6192 from ninjadq/fix_session_expire_issue
Fix: When session expire can not click anything
2018-11-01 13:59:49 +08:00
Fangyuan Cheng
0c8a78f62d
Merge pull request #6193 from pureshine/retag-tips
Let the retag error prompt show complete
2018-11-01 13:48:36 +08:00
FangyuanCheng
74046cb5e1 Let the retag error prompt show complete
Signed-off-by: FangyuanCheng <fangyuanc@vmware.com>
2018-11-01 13:13:22 +08:00
Qian Deng
558638f912 Fix: When session expire can not click anything
This is casued that not handle 401 err on member routing guard

Signed-off-by: Qian Deng <dengq@vmware.com>
2018-11-01 13:12:48 +08:00
wang yan
072127a70c Build clair version into clair image
This commit is to add the clair_version into the harbor images, then clair
will use it in the user-agent, and helpful for the debugging.

Signed-off-by: wang yan <wangyan@vmware.com>
2018-10-31 16:29:06 +08:00
Steven Zou
e37e275a77
Merge pull request #6183 from steven-zou/use_separate_conn
Use separate redis conn for the lock mechanism in the periodic enqueuer
2018-10-31 15:55:18 +08:00
Steven Zou
300977d539 Use separate redis conn for the lock mechanism in the periodic enqueuer
Signed-off-by: Steven Zou <szou@vmware.com>
2018-10-31 15:19:11 +08:00
Qian Deng
d517320c78
Merge pull request #6182 from zhoumeina/remove_switch_tab_confirm
remove switch tab confirmation
2018-10-31 15:15:41 +08:00
Meina Zhou
7991387eb8 remove switch tab confirmation
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-10-31 14:46:49 +08:00
Steven Zou
646cf282ba
Merge pull request #6181 from steven-zou/add_test_on_borrow_func
Add TestOnBorrow check func of redis pool to verify the getting conn
2018-10-31 14:10:33 +08:00
Mia ZHOU
1287b0d1b1
Merge pull request #6173 from zhoumeina/refactor_config
refactor configuration
2018-10-31 14:02:59 +08:00