From: W. Trevor King <wking@tremily.us>
Date: Sat, 30 Aug 2014 16:46:20 +0000 (-0700)
Subject: docker-registry/Dockerfile.template: Add flask-cors dependency
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=afa78a6e80a302a96b71f4081b226127dcbdd6c5;p=dockerfile.git

docker-registry/Dockerfile.template: Add flask-cors dependency

This landed in docker-registry's be21b160 (Fix issue #333 - Added CORS
support to 'get images' and 'search' methods in registry REST api,
2014-05-01), which landed in 0.6.9 (2014-05-08).  I need to use Layman
and my overlay until the flask-cors ebuild lands in the main Portage
tree [1].

[1]: https://bugs.gentoo.org/show_bug.cgi?id=517478
---

diff --git a/docker-registry/Dockerfile.template b/docker-registry/Dockerfile.template
index 5478e9a..c6ea9a2 100644
--- a/docker-registry/Dockerfile.template
+++ b/docker-registry/Dockerfile.template
@@ -22,7 +22,7 @@
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
 
-FROM ${NAMESPACE}/gentoo-syslog:${TAG}
+FROM ${NAMESPACE}/gentoo-layman:${TAG}
 MAINTAINER ${MAINTAINER}
 #VOLUME ["${PORTAGE}:/usr/portage:ro", "${PORTAGE}/distfiles:/usr/portage/distfiles:rw"]
 RUN echo 'USE="${USE} sqlite"' >> /etc/portage/make.conf
@@ -31,8 +31,9 @@ RUN sed -i 's/\(PYTHON_SINGLE_TARGET\)=.*/\1="python2_7"/' /etc/portage/make.con
 RUN echo 'USE_PYTHON="2.7"' >> /etc/portage/make.conf
 RUN emerge -v --newuse --deep --with-bdeps=y @system @world
 RUN eselect python set $(eselect python show --python2)
-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/pyyaml dev-python/redis-py dev-python/requests dev-python/rsa dev-python/simplejson dev-python/sqlalchemy dev-vcs/git www-servers/gunicorn
+ADD package.accept_keywords /etc/portage/package.accept_keywords/docker-registry
+RUN layman -a wtk
+RUN emerge -v dev-python/blinker dev-python/boto dev-python/backports-lzma dev-python/flask dev-python/flask-cors 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 4fed4f4..e62333a 100644
--- a/docker-registry/package.accept_keywords
+++ b/docker-registry/package.accept_keywords
@@ -9,6 +9,9 @@
 =dev-python/blinker-1.3 ~amd64
 =dev-python/itsdangerous-0.24 ~amd64
 
+# required by dev-python/flask-cors (argument)
+=dev-python/flask-cors-0.8.0 ~amd64
+
 # required by dev-python/backports-lzma (argument)
 =dev-python/backports-lzma-0.0.2-r1 ~amd64