build.sh: Bump DATE to 20150402

[dockerfile.git] / buildbot / Dockerfile.template

diff --git a/buildbot/Dockerfile.template b/buildbot/Dockerfile.template
index 6df4a466b621fedf0a2ca9d749b66fac5eba505d..07dd6021899bf00e596d662992baa0cc8330bcf6 100644 (file)
--- a/buildbot/Dockerfile.template
+++ b/buildbot/Dockerfile.template
@@ -26,18 +26,16 @@ 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 python3_3"' >> /etc/portage/make.conf
-RUN echo 'PYTHON_SINGLE_TARGET="python3_3"' >> /etc/portage/make.conf
-RUN echo 'USE_PYTHON="2.7 3.3"' >> /etc/portage/make.conf
-RUN emerge -v1 --newuse dev-lang/python:2.7 dev-lang/python:3.3
+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)
 RUN emerge -v dev-util/buildbot dev-util/buildbot-slave
 RUN eselect news read new
 RUN rc-update add buildmaster default
 RUN rc-update add buildslave default
 
-# Container networking happens automatically
-RUN sed -i 's/need net$/use net/' /etc/init.d/*
-
 RUN buildbot create-master /var/lib/buildmaster
 RUN mv /var/lib/buildmaster/master.cfg.sample /var/lib/buildmaster/master.cfg
 RUN buildslave create-slave /var/lib/buildslave localhost:9989 example-slave pass