salt-minion/Dockerfile.template: Namespace /etc/portage/package.*

Use directories instead of files.  This makes it easy for other folks
to drop in their own USE flag and keyword overrides without worring
about appending to our existing files.

diff --git a/salt-minion/Dockerfile.template b/salt-minion/Dockerfile.template
index f48a3c964cfe2b474fd0fc31ac29c0f20fcb4eb3..f3295a786dd53cdfd574c6d8313d166e0267cc63 100644 (file)
--- a/salt-minion/Dockerfile.template
+++ b/salt-minion/Dockerfile.template
@@ -25,31 +25,33 @@
 FROM ${NAMESPACE}/gentoo-syslog:${TAG}
 MAINTAINER ${MAINTAINER}
 #VOLUME ["${PORTAGE}:/usr/portage:ro", "${PORTAGE}/distfiles:/usr/portage/distfiles:rw"]
-RUN echo 'app-admin/salt git' >> /etc/portage/package.use
+RUN mkdir /etc/portage/package.accept_keywords
+RUN mkdir /etc/portage/package.use
+RUN echo 'app-admin/salt git' >> /etc/portage/package.use/salt
 # required by app-admin/salt-0.17.4-r2
 # required by app-admin/salt (argument)
-RUN echo '=dev-python/pyyaml-3.10-r1 ~amd64' >> /etc/portage/package.accept_keywords
+RUN echo '=dev-python/pyyaml-3.10-r1 ~amd64' >> /etc/portage/package.accept_keywords/salt
 # required by app-admin/salt (argument)
-RUN echo '=app-admin/salt-9999 **' >> /etc/portage/package.accept_keywords
+RUN echo '=app-admin/salt-9999 **' >> /etc/portage/package.accept_keywords/salt
 # required by app-admin/salt-0.17.4-r2
 # required by app-admin/salt (argument)
-RUN echo '=dev-python/pycryptopp-0.6.0 ~amd64' >> /etc/portage/package.accept_keywords
+RUN echo '=dev-python/pycryptopp-0.6.0 ~amd64' >> /etc/portage/package.accept_keywords/salt
 # required by app-admin/salt-0.17.4-r2
 # required by app-admin/salt (argument)
-RUN echo '=dev-python/msgpack-0.4.0 ~amd64' >> /etc/portage/package.accept_keywords
+RUN echo '=dev-python/msgpack-0.4.0 ~amd64' >> /etc/portage/package.accept_keywords/salt
 # required by dev-python/git-python-0.3.2_rc1-r1
 # required by dev-python/git-python (argument)
-RUN echo '=dev-python/gitdb-0.5.4-r1 ~amd64' >> /etc/portage/package.accept_keywords
+RUN echo '=dev-python/gitdb-0.5.4-r1 ~amd64' >> /etc/portage/package.accept_keywords/salt
 # required by dev-python/git-python (argument)
-RUN echo '=dev-python/git-python-0.3.2_rc1-r1 ~amd64' >> /etc/portage/package.accept_keywords
+RUN echo '=dev-python/git-python-0.3.2_rc1-r1 ~amd64' >> /etc/portage/package.accept_keywords/salt
 # required by dev-python/gitdb-0.5.4-r1
 # required by dev-python/git-python-0.3.2_rc1-r1
 # required by dev-python/git-python (argument)
-RUN echo '=dev-python/async-0.6.1-r1 ~amd64' >> /etc/portage/package.accept_keywords
+RUN echo '=dev-python/async-0.6.1-r1 ~amd64' >> /etc/portage/package.accept_keywords/salt
 # required by dev-python/gitdb-0.5.4-r1
 # required by dev-python/git-python-0.3.2_rc1-r1
 # required by dev-python/git-python (argument)
-RUN echo '=dev-python/smmap-0.8.2-r1 ~amd64' >> /etc/portage/package.accept_keywords
+RUN echo '=dev-python/smmap-0.8.2-r1 ~amd64' >> /etc/portage/package.accept_keywords/salt
 
 RUN salt_LIVE_COMMIT=v2014.1.0 emerge -v =app-admin/salt-9999 dev-python/git-python
 RUN eselect news read new