/my_data'
+ #data_files=[('my_data', ['data/data_file'])],
+
+ # To provide executable scripts, use entry points in preference to the
+ # "scripts" keyword. Entry points provide cross-platform support and allow
+ # pip to create the appropriate form of executable for the target platform.
+ #entry_points={
+ # 'console_scripts': [
+ # 'harbor=harborclient:main',
+ # ],
+ #},
+)
diff --git a/contrib/sdk/harbor-py/uninstall.sh b/contrib/sdk/harbor-py/uninstall.sh
new file mode 100755
index 000000000..49197286d
--- /dev/null
+++ b/contrib/sdk/harbor-py/uninstall.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -x
+set -e
+
+python setup.py install --record files.txt
+cat files.txt | xargs rm -rf
diff --git a/service/notification.go b/service/notification.go
index 77ade18d3..df3a114f1 100644
--- a/service/notification.go
+++ b/service/notification.go
@@ -94,6 +94,9 @@ func filterEvents(notification *models.Notification) ([]*models.Event, error) {
events := []*models.Event{}
for _, event := range notification.Events {
+ log.Debugf("receive an event: ID-%s, target-%s:%s, digest-%s, action-%s", event.ID, event.Target.Repository, event.Target.Tag,
+ event.Target.Digest, event.Action)
+
isManifest, err := regexp.MatchString(manifestPattern, event.Target.MediaType)
if err != nil {
log.Errorf("failed to match the media type against pattern: %v", err)
@@ -107,12 +110,14 @@ func filterEvents(notification *models.Notification) ([]*models.Event, error) {
//pull and push manifest by docker-client
if strings.HasPrefix(event.Request.UserAgent, "docker") && (event.Action == "pull" || event.Action == "push") {
events = append(events, &event)
+ log.Debugf("add event to collect: %s", event.ID)
continue
}
//push manifest by docker-client or job-service
if strings.ToLower(strings.TrimSpace(event.Request.UserAgent)) == "harbor-registry-client" && event.Action == "push" {
events = append(events, &event)
+ log.Debugf("add event to collect: %s", event.ID)
continue
}
}
diff --git a/static/resources/js/components/user/list-user.directive.html b/static/resources/js/components/user/list-user.directive.html
index 893ad7060..705ca4441 100644
--- a/static/resources/js/components/user/list-user.directive.html
+++ b/static/resources/js/components/user/list-user.directive.html
@@ -44,7 +44,7 @@
//u.email// |
//u.creation_time | dateL : 'YYYY-MM-DD HH:mm:ss'// |
-
+
|
diff --git a/static/resources/js/components/user/toggle-admin.directive.js b/static/resources/js/components/user/toggle-admin.directive.js
index f4eb5e5b7..718a6888e 100644
--- a/static/resources/js/components/user/toggle-admin.directive.js
+++ b/static/resources/js/components/user/toggle-admin.directive.js
@@ -25,7 +25,7 @@
function ToggleAdminController($scope, ToggleAdminService, $filter, trFilter) {
var vm = this;
- vm.isAdmin = (vm.hasAdminRole === 1) ? true : false;
+ vm.isAdmin = (vm.hasAdminRole === 1);
vm.enabled = vm.isAdmin ? 0 : 1;
vm.toggle = toggle;
|