Skip to content
This repository was archived by the owner on Sep 12, 2018. It is now read-only.

Commit d861835

Browse files
author
Olivier Gambier
committed
Documentation update
Started 0.9 changelog Updated readme: * updated URLs * buried direct gunicorn launch * newrelic is now mentioned Docker-DCO-1.1-Signed-off-by: Olivier Gambier <[email protected]> (github: dmp42)
1 parent 07b558e commit d861835

File tree

2 files changed

+29
-13
lines changed

2 files changed

+29
-13
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Docker-registry
22

3+
## 0.9.0-dev
4+
5+
* "loose" dependencies mechanism (DEPS=loose environment var will let you install without strictly versioned dependencies)
6+
* enhanced python version compatibility
7+
* enhanced style checking
8+
* enhanced testing
9+
* uniformized various gunicorn start stances
10+
11+
312
## 0.8.0
413

514
* configuration rehaul: https://github.com/docker/docker-registry/pull/444 - beware this breaks API for the drivers, and the core package has been updated accordingly to denote that

README.md

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ Quick start
1919

2020
The fastest way to get running:
2121

22-
* install docker according to the [following instructions](http://docs.docker.io/installation/#installation)
22+
* install docker according to the [following instructions](https://docs.docker.com/installation/#installation)
2323
* run the registry: `docker run -p 5000:5000 registry`
2424

2525
That will use the
26-
[official image from the Docker index](https://index.docker.io/_/registry/).
26+
[official image from the Docker index](https://registry.hub.docker.com/_/registry/).
2727

2828
Here is another example that will launch a container on port 5000, and store images in an Amazon S3 bucket:
2929
```
@@ -406,10 +406,10 @@ Then install the Registry app:
406406
sudo pip install docker-registry
407407
```
408408
409-
If you need extra requirements, like bugsnag, specify them:
409+
If you need extra requirements, like bugsnag, or new-relic specify them:
410410
411411
```
412-
sudo pip install docker-registry[bugsnag]
412+
sudo pip install docker-registry[bugsnag,newrelic]
413413
```
414414
415415
@@ -429,15 +429,15 @@ should not require the additional repositories.
429429
Then install the Registry app:
430430
431431
```
432-
sudo python-pip install docker-registry[bugsnag]
432+
sudo python-pip install docker-registry[bugsnag,newrelic]
433433
```
434434
435435
(or clone the repository and `pip install .`)
436436
437437
#### Run it
438438
439439
```
440-
gunicorn --access-logfile - -k gevent -b 0.0.0.0:5000 -w 4 --max-requests 100 docker_registry.wsgi:application
440+
docker-registry
441441
```
442442
443443
### How do I setup user accounts?
@@ -451,13 +451,6 @@ auth enabled (see `contrib/` for examples).
451451
The recommended setting to run the Registry in a prod environment is gunicorn
452452
behind a nginx server which supports chunked transfer-encoding (nginx >= 1.3.9).
453453
454-
You could use for instance supervisord to spawn the registry with 8 workers
455-
using this command:
456-
457-
```
458-
gunicorn -k gevent --max-requests 100 --graceful-timeout 3600 -t 3600 -b localhost:5000 -w 8 docker_registry.wsgi:application
459-
```
460-
461454
#### nginx
462455
463456
[Here is an nginx configuration file example.](https://github.com/docker/docker-registry/blob/master/contrib/nginx.conf), which applies to versions < 1.3.9 which are compiled with the [HttpChunkinModule](http://wiki.nginx.org/HttpChunkinModule).
@@ -481,6 +474,20 @@ requests to the Docker Registry:
481474
ProxyPassReverse / http://localhost:5000/
482475
```
483476
477+
#### Advanced start options (NOT recommended)
478+
479+
If you want greater control over gunicorn:
480+
481+
```
482+
gunicorn -c contrib/gunicorn.py docker_registry.wsgi:application
483+
```
484+
485+
or even bare
486+
487+
```
488+
gunicorn --access-logfile - --error-logfile - -k gevent -b 0.0.0.0:5000 -w 4 --max-requests 100 docker_registry.wsgi:application
489+
```
490+
484491
For developers
485492
--------------
486493

0 commit comments

Comments
 (0)