From c8e78bc60c678bcef9b8f990c9a591cf07e2696a Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Fri, 12 Sep 2014 12:14:06 -0700 Subject: [PATCH] docker-registry/Dockerfile.template: Drop Layman from the stack I needed Layman in afa78a6e (docker-registry/Dockerfile.template: Add flask-cors dependency, 2014-08-30), because my flask-cors ebuild wasn't in the main Portage tree yet. With 01d1a28f (build.sh: Bump DATE to 20140911, 2014-09-12), we're pulling in a Portage tree that does have my flask-cors package, so we no longer need the Layman stuff here. --- docker-registry/Dockerfile.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-registry/Dockerfile.template b/docker-registry/Dockerfile.template index 4f8b79a..4782a0c 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-layman:${TAG} +FROM ${NAMESPACE}/gentoo-syslog:${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,8 @@ 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) +RUN mkdir /etc/portage/package.accept_keywords COPY 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 -- 2.26.2