Commit Graph

5628 Commits

Author SHA1 Message Date
stonezdj(Daojun Zhang)
ae007c2a49
Merge pull request #6247 from stonezdj/trust_cert2
Install custom cert for clair, registry, chartmuseum
2018-11-12 14:07:34 +08:00
Daniel Jiang
555c0cb181
Merge pull request #6220 from stonezdj/add_util_linux
Fix issue when query psql cli failed on more command not found
2018-11-09 17:39:47 +08:00
stonezdj
0a72f3729a Install custom cert for clair, registry, chartmuseum
Signed-off-by: stonezdj <stonezdj@gmail.com>
2018-11-09 15:03:03 +08:00
Daniel Jiang
dd9bd10e68
Merge pull request #6238 from ywk253100/181108_proxy
Replace ui with core for no_proxy in harbor.cfg
2018-11-09 14:19:13 +08:00
Qian Deng
6a3fe60d55
Merge pull request #6246 from zhoumeina/refactor_registry_for_admiral
Refactor registry for admiral
2018-11-09 13:48:43 +08:00
Meina Zhou
6bcc803588 modify registry component using tabs
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-11-09 12:58:26 +08:00
Wenkai Yin
32c42be677
Merge pull request #6241 from steven-zou/logger_framework_job_service
Uncomment the harbor configuration injection code block
2018-11-09 10:41:52 +08:00
Steven Zou
01bb7f4abb Uncomment the harbor configuration injection code block
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-09 10:19:14 +08:00
Steven Zou
8f0e8d083a Fix typo in the README doc of jobservice
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-08 18:24:41 +08:00
Steven Zou
b3c87673a6
Merge pull request #6215 from steven-zou/logger_framework_job_service
Build logger framework to support configurable loggers/sweepers/getters
2018-11-08 18:15:36 +08:00
Wenkai Yin
64cb507421 Replace ui with core for no_proxy in harbor.cfg
As we split UI into two components: portal and core, the value of no_proxy needs to be updated

Signed-off-by: Wenkai Yin <yinw@vmware.com>
2018-11-08 16:10:26 +08:00
Mia ZHOU
08081d38fa modify test ldap button xpath (#6236)
Signed-off-by: Meina Zhou <meinaz@vmware.com>
2018-11-08 13:44:13 +08:00
Steven Zou
093bf9fc8a Update the job service config yaml in the installation template
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-08 10:40:39 +08:00
Steven Zou
e6d4c024ee Update README of job service to reflect latest updates
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-08 10:35:12 +08:00
danfengliu
7494050534 add test case name in API_DB
Signed-off-by: danfengliu <danfengl@vmware.com>
2018-11-08 10:33:14 +08:00
danfengliu
ce8a585858 modfiy repo
Signed-off-by: danfengliu <danfengl@vmware.com>
2018-11-08 10:33:14 +08:00
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
Steven Zou
e9194ca107 Add/update unit test cases for the new implemented job logger framework
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-06 14:43:06 +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
stonezdj
8c37b0877a Fix issue when query psql cli failed on more command
Signed-off-by: stonezdj <stonezdj@gmail.com>
2018-11-06 13:09:20 +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
Steven Zou
7b106d06c5 Build logger framework to support configurable loggers/sweepers/getters
Signed-off-by: Steven Zou <szou@vmware.com>
2018-11-06 09:31:31 +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