Upstream
/
harbor
mirror of https://github.com/goharbor/harbor.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2332 from vmware/release-1.1.0 

merge 1.1.0 to master
This commit is contained in:
Daniel Jiang 2017-05-19 07:19:46 -07:00 committed by GitHub
parent d45ef78eaf 0b02231093
commit 32102c1523
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

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

4
docs/user_guide.md
View File

@ -220,7 +220,7 @@ Run the below commands on the host which Harbor is deployed on to preview what f
```sh ```sh
$ docker-compose stop $ 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. **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 ```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 $ docker-compose start
``` ```

2
make/dev/docker-compose.yml
View File

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

2
make/docker-compose.tpl
View File

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

2
tests/docker-compose.test.yml
View File

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