Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-29 05:35:43 +01:00
Code Issues Projects Releases Wiki Activity
7,913 Commits 53 Branches 317 Tags 335 MiB
ece321a53a
Commit Graph

799 Commits

Author SHA1 Message Date
stonezdj(Daojun Zhang)
ca97c85279
Merge pull request #8927 from ninjadq/fix_config_with_components 
Add logic to read clair and notary config
 2019-09-09 15:50:09 +08:00
DQ
495a257ab5 Add logic to read clair and notary config 
Signed-off-by: DQ <dengq@vmware.com>
 2019-09-05 12:49:32 +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
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
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
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
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
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
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
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
Wenkai Yin(尹文开)
5da4286ef4 Hard delete project metadata (#8856) 
Hard delete project metadata

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-08-29 12:14:39 +08:00
Wang Yan
87893abc5e
Merge pull request #8829 from ywk253100/190822_retry_status 
Add status revision to handle retrying in replication task
 2019-08-28 10:55:13 +08:00
Wang Yan
39f78ae768
Merge pull request #7872 from cd1989/config-redis-pool-idletimeout 
Config idle timeout for redis pool to avoid jobservice restarting
 2019-08-27 14:46:01 +08:00
Wenkai Yin
7924f37d86 Add status revision to handle retrying in replication task 
Add status revision to handle retrying in replication task

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-08-27 14:17:11 +08:00
wang yan
28f7b7a64e fix #8839: update bolb size type to bigint 
and extend the length of content type to 1024

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-27 10:43:29 +08:00
DQ
fe3c71094b Disable redis and db containers if external db enabled 
If depend on external redis or pg. local db and redis should not start. Therefore can save some resources.

Signed-off-by: DQ <dengq@vmware.com>
 2019-08-26 17:59:13 +08:00
Wang Yan
35e786e54c
Merge pull request #8794 from ywk253100/190822_retry_status 
Add status revision to retention task to handle retrying
 2019-08-23 10:54:35 +08:00
Wang Yan
c9dc262540
Merge pull request #8773 from ninjadq/Feat--migration_scritp_180_2_190 
Feat: Add migration script for 1.9
 2019-08-22 23:51:14 +08:00
Wenkai Yin
661470e7bc Add status revision to retention task to handle retrying 
Add status revision to retention task to handle retrying

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-08-22 20:04:25 +08:00
Wenkai Yin(尹文开)
a9d77f5c2c
Merge pull request #8589 from ninjadq/upgrade_docker-compose_checker 
Update docker-compose checker
 2019-08-22 20:00:42 +08:00
DQ
fd7b867fe3 Add config template 
Add upgrade script
Update latest version

Signed-off-by: DQ <dengq@vmware.com>
 2019-08-22 17:23:33 +08:00
He Weiwei
a2c8536d37 fix(build): install tzdata pkg for core and jobservice images 
Closes #8314

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-08-21 14:40:29 +00:00
cd1989
db9b52d827 Config idle timeout for redis pool 
Signed-off-by: cd1989 <chende@caicloud.io>
 2019-08-20 17:23:32 +08:00
Steven Zou
217252a097
Merge pull request #8675 from ywk253100/190814_retention_task 
Handle the retention task status updating in concurrency
 2019-08-20 17:07:21 +08:00
Daniel Jiang
f674bb4e6c
Merge pull request #8590 from ninjadq/fix_registry_log_level 
Fix: registry log level rendering issue
 2019-08-20 09:11:56 +08:00
Daniel Jiang
f10fb67d6d
Merge pull request #8662 from stonezdj/email_sec2 
Set default email to null if not provided
 2019-08-20 09:01:50 +08:00
Daniel Jiang
b34fda173c Bump up Clair to v2.0.9 
Fixes #8584

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-08-19 16:19:29 +08:00
stonezdj
5fa8eb7854 Set default email to null if not provided 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-08-19 15:20:44 +08:00
Daniel Jiang
b15c6bcdc7
Merge pull request #8259 from amritanshu-pandey/feature/fix-typos 
fix typos in prepare script
 2019-08-19 15:09:24 +08:00
wang yan
6e11ecc6fc Update codes per review comments 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-16 14:58:52 +08:00
Wenkai Yin
48b067f596 Handle the retention task status updating in concurrency 
Compare the status code when updating retention task status to avoid the concurrent issue

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-08-15 18:36:18 +08:00
He Weiwei
98e1f68468 feat(configuration,db): connection pool configs for db 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-08-14 14:30:34 +08:00
Daniel Jiang
ca585f8b9c
Merge pull request #8640 from ninjadq/fix_permission_of_nginx_cert 
Fix permission of nginx cert
 2019-08-14 14:23:40 +08:00
Wenkai Yin(尹文开)
a6445c1ebe
Merge pull request #8472 from kofj/feature/proxy 
Proxy
 2019-08-13 12:27:19 +08:00
Qian Deng
b4975d8601 Fix nginx permission issue 
* mount root of host
* copy file to data dir and change ownership and permission

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-08-13 02:59:27 +00:00
jwangyangls
fd6a422bf8
Merge pull request #8605 from jwangyangls/fix-Link-to-license-hardcoded 
Fix issue width Link to license in the about dialog should not be hardcoded to master
 2019-08-12 10:50:18 +08:00
疯魔慕薇
3e8a73ca1e Proxy 
1. Global proxy config for components.
2. Prepare proxy configure for clair, core and jobservice.

Signed-off-by: 疯魔慕薇 <kfanjian@gmail.com>
 2019-08-11 00:24:18 +08:00
Wang Yan
54a39c7159
Merge pull request #8597 from heww/size-quota 
refactor(quota,middleware): implement size quota by quota interceptor
 2019-08-09 15:44:33 +08:00
Yogi_Wang
53bd4d7897 Fix issue width Link to license in the about dialog should not be hardcoded to master 
Signed-off-by: Yogi_Wang <yawang@vmware.com>
 2019-08-09 13:26:43 +08:00
He Weiwei
e62c29123d refactor(quota,middleware): implement size quota by quota interceptor 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-08-08 23:55:54 +00:00
Qian Deng
a935823e3d
Merge pull request #8362 from ninjadq/non-root-contaienr 
Non root contaienr
 2019-08-08 17:34:25 +08:00
DQ
131d26c0f8 Docker compose check function need updated to 1.23.0+ 
Signed-off-by: DQ <dengq@vmware.com>
 2019-08-08 14:22:03 +08:00
Jakub Onderka
8f83310022 nginx: Remove TLSv1.1 support 
Signed-off-by: Jakub Onderka <jakub.onderka@gmail.com>
 2019-08-07 17:51:31 +02:00
guanxiatao
7e40e335b7 add sql schema 
Signed-off-by: guanxiatao <guanxiatao@corp.netease.com>

Signed-off-by: guanxiatao <guanxiatao@corp.netease.com>
 2019-08-07 21:35:46 +08:00
王添
94d4f9c6b6 add webhook job 
Signed-off-by: 王添 <wangtian@corp.netease.com>
 2019-08-07 20:56:31 +08:00
Steven Zou
f3ba25f656
Merge pull request #8536 from bitsf/tag_retention_task_num 
add task retain num
 2019-08-07 17:39:39 +08:00
DQ
057bc34703 Fix: registry log level rendering issue 
when log level is warning, the actual value of registry should be warn

Signed-off-by: DQ <dengq@vmware.com>
 2019-08-07 14:35:36 +08:00
Qian Deng
dacb1fc79e Add healthcheck in Dockerfile* redis* jobservice 
Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-08-06 13:16:12 +00:00
Qian Deng
89d6370201 Remove ruby dependency while build portal 
Python is already intalled in node image. so we can use python to parse yaml file

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-08-06 05:21:47 +00:00
Qian Deng
303471563f DB container run as non-root 
Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-08-06 05:21:47 +00:00
Qian Deng
8b7f1ae4c0 Add proxy nginx container as non-root user 
Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-08-06 05:21:47 +00:00
Qian Deng
f8a8040c8f Add notary as non-root user 
Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-08-06 05:21:47 +00:00
Qian Deng
29727148b3 Running job service with non-root container 
job-service running with 10000:10000 user

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-08-06 05:21:45 +00:00
Qian Deng
e62a9f1e18 Running redis using non-root user 
redis running with user redis

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-08-06 05:21:45 +00:00
Qian Deng
904f04fac1 Enhance: Running contaienr with non-root user 
* core
* portal

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-08-06 05:21:45 +00:00
Qian Deng
96b62e5741 Make core container to non-root user 
Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-08-06 05:21:45 +00:00
Daniel Jiang
eec4fc2798 Remove clair notifier 
The way Harbor handles notification is problematic.
It currently triggers rescan, which will cause problem when there are
lot of images in the registry.
Such as #7316
This commit removes the notifier and we need to revisit the notification
to figure out how to map the notification to a particular image if need
the notification mechanism in future.

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-08-06 01:58:15 +08:00
Ziming Zhang
026aee75d9 add task retain num 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I2f8b89454fe3bb9b56af237048c9e2b90783f434
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-08-05 17:57:09 +08:00
Daniel Jiang
bd32787813
Merge pull request #8540 from JakubOnderka/patch-2 
nginx.https.conf.jinja template indention fix
 2019-08-02 17:52:51 +08:00
Jakub Onderka
53b5dcfece nginx.https.conf.jinja template indention fix 
Signed-off-by: Jakub Onderka <jakub.onderka@gmail.com>
 2019-08-01 22:24:19 +02:00
wang yan
6987825ffd Delete the nono scan all schedule in migration 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-08-01 16:59:13 +08:00
wang yan
4410cc93f9 add internal reg request handler chain 
this is for internal registry api call, the request should be intercpeted by quota middlerwares, like retag and delete.
Note: The api developer has to know that if the internal registry call in your api, please consider to use
NewRepositoryClientForLocal() to init the repository client, which can handle quota change.

Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-30 19:39:56 +08:00
Wenkai Yin(尹文开)
7fd06edccf
Merge pull request #8451 from ywk253100/190729_retention_task 
Add property "repository" to retention task
 2019-07-29 17:18:42 +08:00
Ziming Zhang
ba47b4c00f get execution status on the fly 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: Iefcf8946d7a2c7a27bc22bd326ee9723b4b79c66
 2019-07-29 14:48:39 +08:00
Wenkai Yin
a55860d2df Add property "repository" to retention task 
Add property "repository" to retention task

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-29 13:47:18 +08:00
Wenkai Yin(尹文开)
d45674960f
Merge pull request #8417 from goharbor/project-quota-dev 
Add feature project quota dev
 2019-07-26 15:41:09 +08:00
Wenkai Yin
2e9521ad45 Support to stop one execution of retention 
Support to stop one execution of retention

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-25 16:48:00 +08:00
wang yan
4763864dae merge with latest master code with quota feature branch 
Signed-off-by: wang yan <wangyan@vmware.com>
 2019-07-24 08:47:05 -07:00
Ziming
43c2af9857 map retention with policy (#8313) 
Signed-off-by: Ziming Zhang <zziming@vmware.com>

Implement the API and controller of tag retention
 - API handler
 - retention controller
 - dao
 2019-07-24 17:22:26 +08:00
He Weiwei
ce58c58c01 feat(quota,api): quota support for create project API 
Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2019-07-24 01:02:51 +08:00
Wenkai Yin
03cc8046eb Implement the task management in retention manager 
Implement the task management in retention manager

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-23 19:23:04 +08:00
Wenkai Yin
7362fae7cc Implement a common scheduler 
Implement a common scheduler that can be used globally

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-07-23 17:20:31 +08:00
He Weiwei
9c9b8d3a6d Merge branch 'master' into project-quota-dev 2019-07-19 10:02:51 +08:00
Steven Zou
746d082e2e Merge branch 'master' into feature/tag_retention 2019-07-18 10:40:49 +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
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
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
Ziming Zhang
815901ea33 fix 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
Change-Id: I3f2d3c7f1e32b4983c31c23d9753f04239e3c82f
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-07-16 19:24:40 +08:00
stonezdj
bb2ae7c093 Add HTTP group feature 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-07-16 15:38:46 +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
Amritanshu Pandey
bde54cf938 fix typos 
Signed-off-by: Amritanshu Pandey <amp.msit@gmail.com>
 2019-07-15 04:28:10 +00: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
Ronald van Butselaar
7cd29b399a Add SELinux label to all volumes inside prepare script 
Signed-off-by: Ronald van Butselaar <ronald@vbutselaar.nl>
 2019-06-28 16:21:39 +02:00
Steven Zou
5521b7b7ad
Merge pull request #7915 from bitsf/replication_ecr_1.9 
aws driver for replication
 2019-06-27 11:24:54 +08:00
Daniel Jiang
4aca812ff2 API for system level vulnerability whitelist 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2019-06-26 23:35:40 +08:00
Ziming Zhang
072bdd101b aws driver for replication 
Change-Id: I8792ffce2eaa5975359bb6159a1ba7b85926a925
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2019-06-25 19:11:27 +08:00
stonezdj
a8cd1bca59 Change the mount target of gcs.key file 
Signed-off-by: stonezdj <stonezdj@gmail.com>
 2019-06-16 13:34:32 +08:00
Wenkai Yin
1ceb7a2fb9
Merge pull request #7825 from ninjadq/update_installation_doc 
Update doc caused by refactor prepare
 2019-05-17 10:02:47 +08:00
Qian Deng
48151f6d46 Update doc caused by refactor prepare 
Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-05-16 23:01:12 +08:00
Wenkai Yin
64cacc99e0
Merge pull request #7750 from liqiang-fit2cloud/fix-7288 
Fix issue: harbor 1.7.4 aliyun oss chartmuseum 500
 2019-05-16 18:23:35 +08:00
Qian Deng
f75a60f300 Fix typo 
Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-05-16 15:15:42 +08:00
Qian Deng
f4ac7f9b4a
Merge pull request #7816 from ninjadq/fix_typo_of_azure 
fix typo of azure config
 2019-05-16 10:53:22 +08:00
Qian Deng
ea889d5a50 Fix typo in azure config 
Fix typo in chart azure

Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-05-15 18:25:34 +08:00
Wenkai Yin
1a8a55855b Add "MaxMessageSize" to the config of rsyslogd 
Add "MaxMessageSize" to the config of rsyslogd to avoid the mess of log file when the size of one log line > 8k

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2019-05-15 18:10:22 +08:00
Qian Deng
1677686140 Made logs in jobservice configurable 
Signed-off-by: Qian Deng <dengq@vmware.com>
 2019-05-15 10:57:42 +08:00
Qian Deng
4188c4db76
Merge pull request #7719 from ninjadq/fix_chart_relative_url_issue 
Fix chart relative url issue
 2019-05-15 10:02:07 +08:00