Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-24 11:15:24 +01:00
Code Issues Projects Releases Wiki Activity
9,881 Commits 48 Branches 317 Tags 353 MiB
18f41bad88
Commit Graph

9881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Sun
18f41bad88
Merge pull request #13085 from AllForNothing/replication 
Add disable/enable function to replication rules
 2020-09-24 17:35:51 +08:00
Wenkai Yin(尹文开)
8b9727f53f
Support store the cron type in the schedule (#13097) 
There is requirement that show the cron type(daily, weekly, etc.) on the UI, this commit adds the support for storing the cron type in the schedule model

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-09-24 16:48:56 +08:00
Wang Yan
1af4c5e7cb
bump up go-digest version (#12992) 
Signed-off-by: wang yan <wangyan@vmware.com>
 2020-09-24 16:47:29 +08:00
Wenkai Yin(尹文开)
a62f05893f
Merge pull request #13129 from ywk253100/200917_task_mgr 
Tiny improvement for the task manager
 2020-09-24 16:46:44 +08:00
Wenkai Yin
1a4106a996 Tiny improvement for the task manager 
Add a new method "StopAndWait" which stops the execution and wait until the execution stopped or get an error

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-09-23 15:24:26 +08:00
stonezdj(Daojun Zhang)
20d4e86e0d
Merge pull request #13109 from Thoro/fix-encrypt-error-message 
Add error log in case encryption on config save fails
 2020-09-23 14:03:20 +08:00
Wenkai Yin(尹文开)
59f9ef7e5c
Abstract more info into the extra attributes for images (#13014) 
1. Abstract the "config" property(which contains labels) of config layer into the extra attributes for images
2. Try to get the author information from the "maintainer" label

fixes 12066
fixes 12734

Signed-off-by: Wenkai Yin <yinw@vmware.com>
 2020-09-23 10:42:47 +08:00
Thomas Rosenstein
452a0c9c45 Add error log in case encryption on config save fails 
Signed-off-by: Thomas Rosenstein <thomas.rosenstein@creamfinance.com>
 2020-09-22 10:09:47 +02:00
danfengliu
6caabaef72
Merge pull request #13108 from danfengliu/add-2.1-upgrade-pipeline-in-nightly 
Add 2.1 upgrade pipeline in nightly
 2020-09-22 15:15:46 +08:00
danfengliu
48510fde08
Merge branch 'master' into add-2.1-upgrade-pipeline-in-nightly 2020-09-22 13:48:22 +08:00
danfengliu
aa71bc4628
Merge pull request #12911 from danfengliu/add-retry-for-cnab-push 
Rerun keyword of push CNAB
 2020-09-22 13:38:06 +08:00
danfengliu
ef53edf553 Recovery nightly setup 
1. Recovery nightly setup;
2. Add retry for replication rule selection.
3. Add retry for CNAB test.
4. Rerun keyword of push CNAB

Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-22 02:41:50 +00:00
danfengliu
e2989e3b93 Add 2.0 & 2.1 upgrade pipeline in nightly 
1. Add 2.0 upgrade pipeline in nightly;
2. Add 2.1 upgrade pipeline in nightly.

Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-22 02:14:40 +00:00
Will Sun
b9bb47ca80
Merge pull request #13104 from AllForNothing/i18n-cn 
Improve i18n for tag deletion
 2020-09-18 11:01:34 +08:00
AllForNothing
074f70158e Improve i18n for tag deletion 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-18 09:33:24 +08:00
Will Sun
7ae96f7dcd
Merge pull request #13072 from AllForNothing/registry 
Disable endpoint input for docker-hub and helm-hub
 2020-09-17 10:43:27 +08:00
AllForNothing
abdbd79ed4 Add disable/enable function to replication rules 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-17 10:29:31 +08:00
danfengliu
7e097afde8
Remove ca parameter in helm test case (#13069) 
Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-16 16:31:45 +08:00
AllForNothing
2d1c7ac76b Disable endpont input fot docker-hub and helm-hub 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-16 14:56:31 +08:00
He Weiwei
2db1974081
Merge pull request #13043 from hobti01/patch-1 
fix: Location Header in swagger api common response
 2020-09-15 21:33:37 +08:00
Wenkai Yin(尹文开)
5d22644136
Merge pull request #13040 from bitsf/replication_ecr_auth_role 
feature(replication) enable role based auth for AWS ECR
 2020-09-15 19:13:05 +08:00
danfengliu
ebef11476a
Merge pull request #13002 from danfengliu/upgrade-docker-in-drone-dockerfile 
Create Dockerfile for E2E py-test
 2020-09-15 14:16:11 +08:00
danfengliu
d99ea887f1
Merge pull request #12989 from danfengliu/Add-Checkpoint-for-LDAP-group-py-test 
Add checkpoint for LDAP group py-test
 2020-09-15 14:15:31 +08:00
Ziming Zhang
699518a22e feature(replication) enable role based auth for AWS ECR 
Signed-off-by: Ziming Zhang <zziming@vmware.com>
 2020-09-15 12:46:28 +08:00
Will Sun
55fedc5a9e
Merge pull request #13050 from AllForNothing/notary-cmd 
Improve notary cmd on UI
 2020-09-15 10:43:16 +08:00
danfengliu
86fb6fdc65 Add checkpoint for LDAP group py-test 
LDAP group has different role, user in group has the same role, as groups with different roles were added in project
member list, user should act like in different roles. for admin and dev role, there should be checkpoints to verify priviledges of each own.

Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-14 21:15:09 +08:00
AllForNothing
60c2350088 Improve notary cmd on UI 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-14 18:39:22 +08:00
danfengliu
0dda643bc5 Create Dockerfile for E2E py-test 
Robot tests have been always executed in docker container, but API pyt-test is not,
so rebuild Dockerfile for it. During that, some of tools have been upgraded, so API py-test
 scripts need some modification.

Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-14 02:36:18 +00:00
Tim Hobbs
c7e547e3d2
fix: Location Header in swagger api 
* Add the Location Header to POST responses that use the common response
  Without the header, you cannot know which object you just created.

Signed-off-by: Tim Hobbs <timothy.hobbs@ic-consult.com>
 2020-09-12 14:36:50 +02:00
Will Sun
49c80f954c
Merge pull request #13025 from AllForNothing/uppercase 
Change EXECUTE button to uppercase
 2020-09-11 11:01:03 +08:00
He Weiwei
0444bb1a92
Merge pull request #12986 from hobti01/swag 
fix: Location and Paging support in swagger api
 2020-09-11 10:44:29 +08:00
Daniel Jiang
8846011571
Merge pull request #13017 from chlins/fix/webhook-verify-cert 
fix(webhook): fix the verify cert logic of webhook endpoint
 2020-09-11 02:18:57 +08:00
chlins
685d9277c4 fix(webhook): fix the verify cert logic of webhook endpoint 
Signed-off-by: chlins <chlins.zhang@gmail.com>
 2020-09-10 21:01:25 +08:00
Daniel Jiang
354eaac195
Escape the query string in list user (#13013) 
Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-09-10 20:17:53 +08:00
AllForNothing
01d4539a99 Change EXECUTE button to uppercase 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-10 11:09:13 +08:00
stonezdj(Daojun Zhang)
97b9cc2d5e
Merge pull request #12997 from stonezdj/200902_ldap_filter_fail 
Add ldap filter syntax validation when create search filter
 2020-09-09 16:21:01 +08:00
danfengliu
f90f9a6984
Fix nightly issue caused UI changing (#13006) 
Some UI text display changed, it cause failure in nightly.

Signed-off-by: danfengliu <danfengl@vmware.com>
 2020-09-09 15:20:13 +08:00
stonezdj
b9752f3112 Add ldap filter syntax validation when create search filter 
Correct ldap search filter is enclosed with '(' and ')'
Search ldap group with the ldap group base DN instead of group DN
Fixes #12613 LDAP Group Filter and Group Base DN have no affect

Signed-off-by: stonezdj <stonezdj@gmail.com>
 2020-09-09 10:07:07 +08:00
Qian Deng
1369089603
Merge pull request #13001 from ninjadq/fix_upgrade_trivy 
Fix trivy setting in upgrading script
 2020-09-08 18:59:30 +08:00
DQ
17f3bfccb4 Fix trivy setting in upgrading script 
Signed-off-by: DQ <dengq@vmware.com>
 2020-09-08 18:15:57 +08:00
Daniel Jiang
513c48d47c
Merge pull request #12936 from wy65701436/fix-swagger-dep 
remove the dependency on swagger models
 2020-09-08 18:14:42 +08:00
Will Sun
5586fe86bf
Merge pull request #12988 from AllForNothing/test-4 
Fix UI issues found on testing day
 2020-09-08 01:12:10 +08:00
He Weiwei
8c2922860c
Merge pull request #12993 from heww/fix-issue-12968 
fix(project): change to use user id to query projects of member
 2020-09-07 16:13:56 +08:00
Daniel Jiang
efa34342af
Merge pull request #12964 from wy65701436/remove-tri-sec 
remove the secret file of travis
 2020-09-07 15:05:35 +08:00
He Weiwei
6d50988c8b fix(project): change to use user id to query projects of member 
We know the user id when query projects by member, so use the user id
as entity_id directly in project_member, no need to join harbor_user
table.

Closes #12968

Signed-off-by: He Weiwei <hweiwei@vmware.com>
 2020-09-07 06:35:26 +00:00
AllForNothing
3fa3e14bb6 Fix UI issues found on testing day 
Signed-off-by: AllForNothing <sshijun@vmware.com>
 2020-09-07 12:50:48 +08:00
wang yan
827158badc Merge branch 'master' of https://github.com/goharbor/harbor into remove-tri-sec 2020-09-07 11:57:22 +08:00
Daniel Jiang
6fc0c9d75a
Store User ID in session instead of the whole user model (#12984) 
This commit makes a change so that the user id will be stored in sessoin
after user login instead of user model to avoid data inconsistency when
user model changes.

Fixes #12934

Signed-off-by: Daniel Jiang <jiangd@vmware.com>
 2020-09-07 11:43:37 +08:00
stonezdj(Daojun Zhang)
4267570e99
Merge pull request #12960 from heww/ignore-enable-content-trust-for-proxy-cache 
feat(project): ignore enable_content_trust for proxy project
 2020-09-07 11:25:53 +08:00
Tim Hobbs
4655334e02
fix: Location and Paging support in swagger api 
Signed-off-by: Tim Hobbs <timothy.hobbs@ic-consult.com>
 2020-09-06 21:06:38 +02:00