Skip to content

Commit

Permalink
docker-registry/Dockerfile.template: Adjust Python 2 dependency
Browse files Browse the repository at this point in the history
Now that the ancestor gentoo-python image is removing Python 2, we
need to get it back for docker-registry.  We need to keep the
USE_PYTHON setting (with a tweaked value) because Gunicorn and
Python-RSA haven't transitioned to the *-r1 Python eclasses yet:

  docker run --rm wking/docker-registry /bin/bash -c 'grep inherit /var/db/pkg/  */*/*ebuild' | grep distutils | grep -v -- '-r1'
  /var/db/pkg/dev-python/rsa-3.1.1/rsa-3.1.1.ebuild:inherit distutils
  /var/db/pkg/www-servers/gunicorn-0.17.4/gunicorn-0.17.4.ebuild:inherit distutils eutils
  • Loading branch information
wking committed Aug 30, 2014
1 parent c1223ea commit 699e4a5
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions docker-registry/Dockerfile.template
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,11 @@ 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
RUN echo 'PYTHON_TARGETS="python2_7"' >> /etc/portage/make.conf
RUN echo 'PYTHON_SINGLE_TARGET="python2_7"' >> /etc/portage/make.conf
RUN sed -i 's/\(PYTHON_TARGETS\)=.*/\1="python2_7"/' /etc/portage/make.conf
RUN sed -i 's/\(PYTHON_SINGLE_TARGET\)=.*/\1="python2_7"/' /etc/portage/make.conf
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
RUN eselect news read new
Expand Down

0 comments on commit 699e4a5

Please sign in to comment.