Merge pull request #353 from dotcloud/plugins

Pluggable architecture

Author: dmp42

.editorconfig

@@ -0,0 +1,17 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[test/**/*.txt]
+insert_final_newline = false
+trim_trailing_whitespace = false

.gitignore

@@ -23,3 +23,9 @@ eggs
 
 Vagrantfile
 .vagrant
+
+docker-registry-core.sublime-workspace
+
+*tmp
+
+*.sublime-project

.travis.yml

@@ -1,10 +1,26 @@
 language: python
+
 python:
+  - "2.6"
   - "2.7"
+
 install:
-  - pip install tox
+## 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
+# Install core itself
+  - pip install depends/docker-registry-core/
+
+# Install our tests requirements, and ourselves
+  - pip install -rtests/requirements.txt
   - pip install .
-script: tox
+
+# XXX should run the core tests as well
+script: SETTINGS_FLAVOR=test DOCKER_REGISTRY_CONFIG=config_sample.yml flake8 . && SETTINGS_FLAVOR=test DOCKER_REGISTRY_CONFIG=config_sample.yml python setup.py nosetests
+
 before_install:
   - sudo apt-get update
-  - sudo apt-get install build-essential python-dev libevent-dev python-pip liblzma-dev
+  - sudo apt-get install libevent-dev liblzma-dev
+
+# build-essential python-dev

Dockerfile

@@ -5,26 +5,31 @@
 # TO_BUILD:       docker build -rm -t registry .
 # TO_RUN:         docker run -p 5000:5000 registry
 
-FROM ubuntu:13.10
+# Latest Ubuntu LTS
+from    ubuntu:14.04
 
-RUN apt-get update; \
-    apt-get install -y git-core build-essential python-dev \
-    libevent1-dev python-openssl liblzma-dev wget; \
-    rm /var/lib/apt/lists/*_*
-RUN cd /tmp; wget https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py
-RUN cd /tmp; python ez_setup.py; easy_install pip; \
-    rm ez_setup.py
+# Update
+run apt-get update
+run apt-get -y upgrade
 
-ADD . /docker-registry
-ADD ./config/boto.cfg /etc/boto.cfg
+# Install pip
+run apt-get -y install python-pip
 
-RUN pip install /docker-registry/
+# Install deps for backports.lzma (python2 requires it)
+run apt-get -y install python-dev liblzma-dev libevent1-dev
 
-ENV DOCKER_REGISTRY_CONFIG /docker-registry/config/config_sample.yml
-ENV SETTINGS_FLAVOR dev
+add . /docker-registry
+add ./config/boto.cfg /etc/boto.cfg
 
-EXPOSE 5000
+# Install core
+run pip install /docker-registry/depends/docker-registry-core
 
-WORKDIR /docker-registry
+# Install registry
+run pip install /docker-registry/
 
-CMD exec docker-registry
+env DOCKER_REGISTRY_CONFIG /docker-registry/config/config_sample.yml
+env SETTINGS_FLAVOR dev
+
+expose 5000
+
+cmd exec docker-registry

MANIFEST.in

@@ -0,0 +1,4 @@
+include requirements.txt
+include tests/requirements.txt
+include README.md
+include LICENSE

_postinstall

@@ -6,12 +6,11 @@ cd $SERVICE_APPROOT
     virtualenv --python=python2.7 ~/env || exit 1
 . ~/env/bin/activate
 
-[ -f requirements.txt ] &&
-    pip install --download-cache=~/.pip-cache . || exit 1
+pip install --download-cache=~/.pip-cache ./depends/docker-registry-core || exit 1
+pip install --download-cache=~/.pip-cache . || exit 1
 
 cp -R * ~/
 
 cat > ~/profile << ENDPROFILE
 . ~/env/bin/activate
-export PYTHONPATH=~/
 ENDPROFILE

build.sh

@@ -0,0 +1,17 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[test/**/*.txt]
+insert_final_newline = false
+trim_trailing_whitespace = false

depends/docker-registry-core/.editorconfig

@@ -0,0 +1,14 @@
+.coverage
+.tox
+
+# Packages
+*.egg
+*.egg-info
+dist
+build
+eggs
+
+
+*.DS_Store
+
+*.pyc

depends/docker-registry-core/.gitignore

@@ -0,0 +1,19 @@
+language: python
+python:
+  - "2.6"
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+
+install:
+  - pip install -rtests/requirements-test.txt
+  - pip install -rtests/requirements-style.txt
+  - pip install .
+
+script: flake8 . && python setup.py nosetests
+
+# before_install:
+#   - sudo apt-get update
+#   - sudo apt-get install build-essential python-dev libevent-dev python-pip liblzma-dev
+