Merge pull request #398 from dotcloud/next

Next

Author: dmp42

.dotcloudignore

@@ -1,4 +1,4 @@
 contrib
 .tox
 reports
-test
+tests

.gitignore

@@ -24,8 +24,7 @@ eggs
 Vagrantfile
 .vagrant
 
-docker-registry-core.sublime-workspace
-
 *tmp
 
+*.sublime-workspace
 *.sublime-project

.travis.yml

@@ -7,13 +7,13 @@ python:
 install:
 ## This below should be separated when core lives elsewhere
 # Install core tests reqs
-  - pip install -rdepends/docker-registry-core/tests/requirements-tests.txt
-  - pip install -rdepends/docker-registry-core/tests/requirements-style.txt
+  - pip install -rdepends/docker-registry-core/requirements/test.txt
+  - pip install -rdepends/docker-registry-core/requirements/style.txt
 # Install core itself
   - pip install depends/docker-registry-core/
 
 # Install our tests requirements, and ourselves
-  - pip install -rtests/requirements.txt
+  - pip install -rrequirements/test.txt
   - pip install .
 
 # XXX should run the core tests as well
@@ -22,5 +22,3 @@ script: SETTINGS_FLAVOR=test DOCKER_REGISTRY_CONFIG=config_sample.yml flake8 . &
 before_install:
   - sudo apt-get update
   - sudo apt-get install libevent-dev liblzma-dev
-
-# build-essential python-dev

AUTHORS

@@ -46,6 +46,7 @@ Ken Cochrane <[email protected]>
 Kevin Clark <[email protected]>
 Leon Xiang <[email protected]>
 Lucas Clemente <[email protected]>
+Mangled Deutz <[email protected]>
 Marc Tamsky <[email protected]>
 Marek Goldmann <[email protected]>
 Mario Rodas <[email protected]>

CONTRIBUTE.md

@@ -2,9 +2,9 @@
 
 ## Bare minimum
 
-You need `git`, `pip` and `tox`.
+System-wide, you need `git` and `pip` installed. You also need `tox` (usually just `pip install tox`).
 
-You might need `nose`, `coverage` and `flake`.
+You optionally need `nose`, `coverage` and `flake8` (usually just `pip install nose coverage flake8`) .
 
 
 ## Architecture
@@ -17,7 +17,7 @@ It provides:
 
  * exceptions
  * a driver interface describing how the registry interacts with the data storage
- * a compatibility layer (eg: python version)
+ * a compatibility layer (eg: abstracting behavior differences between python versions)
  * common useful utility code
  * filesystem storage driver
 

Dockerfile

@@ -25,7 +25,7 @@ add ./config/boto.cfg /etc/boto.cfg
 run pip install /docker-registry/depends/docker-registry-core
 
 # Install registry
-run pip install /docker-registry/
+run pip install file:///docker-registry#egg=docker-registry[bugsnag]
 
 env DOCKER_REGISTRY_CONFIG /docker-registry/config/config_sample.yml
 env SETTINGS_FLAVOR dev

MANIFEST.in

@@ -1,4 +1,5 @@
-include requirements.txt
-include tests/requirements.txt
+include requirements/main.txt
+include requirements/test.txt
+include requirements/style.txt
 include README.md
 include LICENSE

README.md

@@ -158,7 +158,7 @@ When using the `config_sample.yml`, you can pass all options through as environm
    *non*-Amazon S3-compliant object store, in one of the boto config files'
    `[Credentials]` section, set `boto_host`, `boto_port` as appropriate for the
    service you are using.
-1. `bugsnag`: The bugsnag API key
+1. `bugsnag`: The bugsnag API key (note that if you don't use the official docker container, you need to install the registry with bugsnag enabled: `pip install docker-registry[bugsnag]`)
 
 ### Authentication options
 
@@ -405,6 +405,13 @@ Then install the Registry app:
 sudo pip install docker-registry
 ```
 
+If you need extra requirements, like bugsnag, specify them:
+
+```
+sudo pip install docker-registry[bugsnag]
+```
+
+
 (or clone the repository and `pip install .`)
 
 #### On Red Hat-based systems:
@@ -421,7 +428,7 @@ should not require the additional repositories.
 Then install the Registry app:
 
 ```
-sudo python-pip install docker-registry
+sudo python-pip install docker-registry[bugsnag]
 ```
 
 (or clone the repository and `pip install .`)

build.sh

@@ -7,7 +7,7 @@ cd $SERVICE_APPROOT
 . ~/env/bin/activate
 
 pip install --download-cache=~/.pip-cache ./depends/docker-registry-core || exit 1
-pip install --download-cache=~/.pip-cache . || exit 1
+pip install --download-cache=~/.pip-cache file://${PWD}#egg=docker-registry[bugsnag] || exit 1
 
 cp -R * ~/
 

contrib/docker-registry.conf

@@ -9,9 +9,10 @@ env REGISTRY_DIR=/srv/docker/registry
 env USER=www-data
 env GROUP=www-data
 env LOG_FILE=/var/log/docker/registry.log
-env NUM_WORKERS=9
+env GUNICORN_WORKERS=9
 
-env ADDRESS=127.0.0.1:5000
+env REGISTRY_PORT=5000
+env REGISTRY_HOST=127.0.0.1
 
 
 pre-start script
@@ -27,5 +28,5 @@ script
 
     [ -r $REGISTRY_DIR/.venv/bin/activate ] && . $REGISTRY_DIR/.venv/bin/activate
     cd $REGISTRY_DIR
-    exec gunicorn -w $NUM_WORKERS --bind=$ADDRESS --user=$USER --group=$GROUP --log-level=$LOG_LEVEL --log-file=$LOG_FILE 2>>$LOG_FILE wsgi:application
+    exec gunicorn -w $GUNICORN_WORKERS --bind=$REGISTRY_HOST:$REGISTRY_PORT --user=$USER --group=$GROUP --log-level=$LOG_LEVEL --log-file=$LOG_FILE 2>>$LOG_FILE docker_registry.wsgi:application
 end script