Merge branch 'new-ui-with-sync-image' of https://github.com/vmware/harbor into new-ui-with-sync-image

Deploy/templates/jobservice/env

@@ -3,6 +3,7 @@ MYSQL_PORT=3306
 MYSQL_USR=root
 MYSQL_PWD=$db_password
 UI_SECRET=$ui_secret
+CONFIG_PATH=/etc/jobservice/app.conf
 REGISTRY_URL=http://registry:5000
 VERIFY_REMOTE_CERT=$verify_remote_cert
 MAX_JOB_WORKERS=$max_job_workers

docs/user_guide.md

@@ -4,9 +4,14 @@ This guide takes you through the fundamentals of using Harbor. You'll learn how
 
 * Manage your projects.
 * Manage members of a project.
+* Replicate projects to a remote registry.
 * Search projects and repositories.
-* Manage Harbor system if you are the system administrator.
+* Manage Harbor system if you are the system administrator:
+ + Manage users.
+ + Manage destinations.
+ + Manage replication policies.
 * Pull and push images using Docker client.
+* Delete repositories.
 
 
 ##Role Based Access Control
@@ -37,39 +42,60 @@ A project in Harbor contains all repositories of an application. RBAC is applied
 * **Public**: All users have the read privilege to a public project, it's convenient for you to share some repositories with others in this way.
 * **Private**: A private project can only be accessed by users with proper privileges.  
 
-You can create a project after you signed in. Enabling the "Public project" checkbox will make this project public.  
+You can create a project after you signed in. Enabling the "Public" checkbox will make this project public.  
 
-![create project](img/create_project.png)  
+![create project](img/new_create_project.png)  
 
-After the project is created, you can browse repositories, users and access logs using the navigation column on the left.  
+After the project is created, you can browse repositories, users and logs using the navigation tab.  
 
-![browse project](img/browse_project.png)  
+![browse project](img/new_browse_project.png)  
 
-All access logs can be listed by clicking "Logs". You can apply a filter by username, or operations and dates under "Advanced Search".  
+All logs can be listed by clicking "Logs". You can apply a filter by username, or operations and dates under "Advanced Search".  
 
-![browse project](img/project_log.png)  
+![browse project](img/new_project_log.png)  
 
 ##Managing members of a project 
 ###Adding members
 You can add members with different roles to an existing project.  
 
-![browse project](img/add_member.png)
+![browse project](img/new_add_member.png)
 
 ###Updating and removing members
 You can update or remove a member by clicking the icon on the right.  
 
-![browse project](img/remove_update_member.png)
+![browse project](img/new_remove_update_member.png)
+
+##Replicating images
+If you are a system administrator, you can replicate images to a remote registry, which is called destination in Harbor. Only Harbor instance is supported as a destination for now.  
+Click "Add New Policy" on the "Replication" tab, fill the necessary fields and click "OK", a policy for this project will be created. If  "Enable" is chosen, the project will be replicated to the remote immediately, and when a new repository is pushed to this project or an existing repository is deleted from this project, the same operation will also be replicated to the destination.  
+
+![browse project](img/new_create_policy.png)
+
+You can enable or disable a policy in the policy list view, and only the policies which are disbled can be edited.  
+Click a policy, jobs which belong to this policy will be listed. A job represents the progress which will replicate a repository of one project to the remote.
+
+![browse project](img/new_policy_list.png)
 
 ##Searching projects and repositories
-Entering a keyword in the search field at the top lists all matching projects and repos. The search result includes public repos and private repos you have access privilege to.  
+Entering a keyword in the search field at the top lists all matching projects and repositories. The search result includes both public and private repositories you have access privilege to.  
 
-![browse project](img/search.png)
+![browse project](img/new_search.png)
 
 ##Administrator options
-###Setting administrator and deleting user
-Administrator can add "SysAdmin" role to an ordinary user by toggling the switch under "System Admin". To delete a user, click on the recycle bin icon.  
+###Managing user
+Administrator can add "administrator" role to an ordinary user by toggling the switch under "Administrator". To delete a user, click on the recycle bin icon.  
 
-![browse project](img/set_admin_remove_user.png)
+![browse project](img/new_set_admin_remove_user.png)
+
+###Managing destination
+You can list, add, edit and delete destinations in the "Destination" tab. Only destinations which are not referenced by any policies can be edited.  
+
+![browse project](img/new_manage_destination.png)
+
+###Managing replication
+You can list, edit, enable and disable policies in the "Replication" tab. Make sure the policy is disabled before you edit it.  
+
+![browse project](img/new_manage_replication.png)
 
 ##Pulling and pushing images using Docker client
 
@@ -119,4 +145,28 @@ Push the image:
 $ docker push 10.117.169.182/demo/ubuntu:14.04  
 ```  
 
-**Note: Replace "10.117.169.182" with the IP address or domain name of your Harbor node.**
+**Note: Replace "10.117.169.182" with the IP address or domain name of your Harbor node.**
+
+##Deleting repositories
+
+Repositories deletion runs in two steps.  
+First, delete repositories in Harbor's UI. This is soft deletion. You can delete the entire repository or just a tag of it.  
+
+![browse project](img/new_delete_repository.png)
+
+**Note: If both tag A and tag B reference the same image, after deleting tag A, B will also disappear.**  
+
+Second, delete the real data using registry's garbage colliection(GC).  
+Make sure that no one is pushing images or Harbor is not running at all before you do GC. If someone were to push an image while GC is running, there is the risk that the image's layers will be mistakenly deleted, leading to a corrupted image. So before running GC, a preferred approach is to stop Harbor first.  
+
+Run the command on the host which harbor is deployed on. 
+
+```sh
+$ docker-compose stop
+$ docker run -it --name gc --rm --volumes-from deploy_registry_1 registry:2.4.0 garbage-collect [--dry-run] /etc/registry/config.yml
+$ docker-compose start
+```  
+
+Option "--dry-run" will print the progress without removing any data.  
+
+About the details of GC, please see [GC](https://github.com/docker/distribution/blob/master/docs/garbage-collection.md).  

models/replication_job.go

@@ -35,6 +35,8 @@ const (
 	JobFinished string = "finished"
 	//JobCanceled ...
 	JobCanceled string = "canceled"
+	//JobRetrying indicate the job needs to be retried, it will be scheduled to the end of job queue by statemachine after an interval.
+	JobRetrying string = "retrying"
 	//JobContinue is the status returned by statehandler to tell statemachine to move to next possible state based on trasition table.
 	JobContinue string = "_continue"
 	//RepOpTransfer represents the operation of a job to transfer repository to a remote registry/harbor instance.