Merge pull request #2332 from vmware/release-1.1.0

merge 1.1.0 to master

Makefile

@@ -79,7 +79,7 @@ REGISTRYSERVER=
 REGISTRYPROJECTNAME=vmware
 DEVFLAG=true
 NOTARYFLAG=false
-REGISTRYVERSION=photon-2.6.0
+REGISTRYVERSION=2.6.1-photon
 NGINXVERSION=1.11.5-patched
 PHOTONVERSION=1.0
 NOTARYVERSION=server-0.5.0

docs/user_guide.md

@@ -220,7 +220,7 @@ Run the below commands on the host which Harbor is deployed on to preview what f
 ```sh
 $ docker-compose stop
 
-$ docker run -it --name gc --rm --volumes-from registry vmware/registry:photon-2.6.0 garbage-collect --dry-run /etc/registry/config.yml
+$ docker run -it --name gc --rm --volumes-from registry vmware/registry:2.6.1-photon garbage-collect --dry-run /etc/registry/config.yml
 
 ```  
 **NOTE:** The above option "--dry-run" will print the progress without removing any data.  
@@ -229,7 +229,7 @@ Verify the result of the above test, then use the below commands to perform garb
 
 ```sh
 
-$ docker run -it --name gc --rm --volumes-from registry vmware/registry:photon-2.6.0 garbage-collect  /etc/registry/config.yml
+$ docker run -it --name gc --rm --volumes-from registry vmware/registry:2.6.1-photon garbage-collect  /etc/registry/config.yml
 
 $ docker-compose start
 ```  

make/dev/docker-compose.yml

@@ -13,7 +13,7 @@ services:
     networks:
       - harbor
   registry:
-    image: vmware/registry:photon-2.6.0
+    image: vmware/registry:2.6.1-photon
     container_name: registry
     restart: always
     volumes:

make/docker-compose.tpl

@@ -11,7 +11,7 @@ services:
     networks:
       - harbor
   registry:
-    image: vmware/registry:photon-2.6.0
+    image: vmware/registry:2.6.1-photon
     container_name: registry
     restart: always
     volumes:

tests/docker-compose.test.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   registry:
-    image: library/registry:2.6.0
+    image: vmware/registry:2.6.1-photon
     restart: always
     volumes:
       - /data/registry:/storage