From: W. Trevor King <wking@tremily.us>
Date: Fri, 18 Jul 2014 20:00:04 +0000 (-0700)
Subject: docker-registry: Trim dependencies now that some storage backends are external
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9d0c1c56a8228d35e9b9224639813c77a9cbd222;p=dockerfile.git

docker-registry: Trim dependencies now that some storage backends are external

The swift backend moved out-of-core in f700ecda (s3 / boto
support - updated drivers, tests, mock, etc etc, 2014-05-15).

The glance backend moved out-of-core in commit 2e28ad0c (Cleanup,
2014-05-15), which also removed the keystoneclient dependency.

pyopenssl (Debian's python-openssl) was never imported anywhere, and
the Dockerfile reference was removed in 365b6313 (Cleaned-up docker
file, 2014-05-19).
---

diff --git a/docker-registry/Dockerfile.template b/docker-registry/Dockerfile.template
index 133be13..73c6c45 100644
--- a/docker-registry/Dockerfile.template
+++ b/docker-registry/Dockerfile.template
@@ -30,7 +30,7 @@ RUN echo 'PYTHON_TARGETS="python2_7"' >> /etc/portage/make.conf
 RUN echo 'PYTHON_SINGLE_TARGET="python2_7"' >> /etc/portage/make.conf
 RUN echo 'USE_PYTHON="2.7"' >> /etc/portage/make.conf
 ADD package.accept_keywords /etc/portage/package.accept_keywords
-RUN emerge -v dev-python/blinker dev-python/boto dev-python/backports-lzma dev-python/flask dev-python/gevent dev-python/pyopenssl dev-python/python-glanceclient dev-python/python-keystoneclient dev-python/python-swiftclient dev-python/pyyaml dev-python/redis-py dev-python/requests dev-python/rsa dev-python/simplejson dev-python/sqlalchemy dev-vcs/git www-servers/gunicorn
+RUN emerge -v dev-python/blinker dev-python/boto dev-python/backports-lzma dev-python/flask dev-python/gevent dev-python/pyyaml dev-python/redis-py dev-python/requests dev-python/rsa dev-python/simplejson dev-python/sqlalchemy dev-vcs/git www-servers/gunicorn
 RUN eselect news read new
 RUN git clone git://github.com/dotcloud/docker-registry.git
 RUN cp --no-clobber docker-registry/config/config_sample.yml docker-registry/config/config.yml
diff --git a/docker-registry/package.accept_keywords b/docker-registry/package.accept_keywords
index 8f0a335..4fed4f4 100644
--- a/docker-registry/package.accept_keywords
+++ b/docker-registry/package.accept_keywords
@@ -6,6 +6,7 @@
 
 # required by dev-python/flask-0.10.1-r1
 # required by dev-python/flask (argument)
+=dev-python/blinker-1.3 ~amd64
 =dev-python/itsdangerous-0.24 ~amd64
 
 # required by dev-python/backports-lzma (argument)
@@ -14,41 +15,3 @@
 # required by dev-python/backports-lzma-0.0.2-r1
 # required by dev-python/backports-lzma (argument)
 =dev-python/backports-1.0 ~amd64
-
-# required by dev-python/blinker (argument)
-=dev-python/blinker-1.3 ~amd64
-
-# required by dev-python/python-glanceclient (argument)
-=dev-python/python-glanceclient-0.12.0 ~amd64
-
-# required by dev-python/python-glanceclient-0.12.0
-# required by dev-python/python-glanceclient (argument)
-=dev-python/python-keystoneclient-0.7.1 ~amd64
-=dev-python/warlock-1.0.1 ~amd64
-
-# required by dev-python/warlock-1.0.1
-# required by dev-python/python-glanceclient-0.12.0
-# required by dev-python/python-glanceclient (argument)
-=dev-python/jsonpatch-1.5 ~amd64
-=dev-python/jsonschema-2.3.0 ~amd64
-
-# required by dev-python/jsonpatch-1.5
-# required by dev-python/warlock-1.0.1
-# required by dev-python/python-glanceclient-0.12.0
-# required by dev-python/python-glanceclient (argument)
-=dev-python/jsonpointer-1.3 ~amd64
-
-# required by dev-python/python-keystoneclient-0.7.1
-# required by dev-python/python-glanceclient-0.12.0
-# required by dev-python/python-glanceclient (argument)
-=dev-python/iso8601-0.1.10 ~amd64
-=dev-python/oslo-config-1.2.1 ~amd64
-=dev-python/pbr-0.7.0 ~amd64
-=dev-python/six-1.6.1 ~amd64
-
-# required by dev-python/python-swiftclient (argument)
-=dev-python/python-swiftclient-1.9.0 ~amd64
-
-# required by dev-python/python-swiftclient-1.9.0
-# required by dev-python/python-swiftclient (argument)
-=dev-python/d2to1-0.2.11 ~amd64