From: W. Trevor King <wking@tremily.us>
Date: Thu, 9 Apr 2015 04:26:44 +0000 (-0700)
Subject: */Dockerfile.template: mkdir -p /etc/portage/package.use
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=269a64f1f54b8f5077bbf27d6b93eabffdb4fa9b;p=dockerfile.git

*/Dockerfile.template: mkdir -p /etc/portage/package.use

With the stage3 from 20150402 the directory already exists:

  # cat /etc/portage/package.use/iputils
  net-misc/iputils -caps -filecaps

I don't know how reliable that's going to be though, so I'm not
dropping the mkdir call entirely.

Dockerfile.templates that used to write to an /etc/portage/package.use
file now write to a package-specific file inside the package.use
directory (which is better practice anyway).
---

diff --git a/gentoo-layman/Dockerfile.template b/gentoo-layman/Dockerfile.template
index c6fe3ab..48a623a 100644
--- a/gentoo-layman/Dockerfile.template
+++ b/gentoo-layman/Dockerfile.template
@@ -27,7 +27,7 @@ MAINTAINER ${MAINTAINER}
 #VOLUME ["${PORTAGE}:/usr/portage:ro", "${PORTAGE}/distfiles:/usr/portage/distfiles:rw"]
 
 RUN mkdir /etc/portage/package.accept_keywords
-RUN mkdir /etc/portage/package.use
+RUN mkdir -p /etc/portage/package.use
 # avoid a Python 2 dependency
 RUN echo 'dev-vcs/git -python' >> /etc/portage/package.use/layman
 RUN echo 'app-portage/layman ~amd64' >> /etc/portage/package.accept_keywords/layman
diff --git a/nagios/Dockerfile.template b/nagios/Dockerfile.template
index d783125..5bc3b12 100644
--- a/nagios/Dockerfile.template
+++ b/nagios/Dockerfile.template
@@ -25,10 +25,11 @@
 FROM ${NAMESPACE}/gentoo-syslog:${TAG}
 MAINTAINER ${MAINTAINER}
 #VOLUME ["${PORTAGE}:/usr/portage:ro", "${PORTAGE}/distfiles:/usr/portage/distfiles:rw"]
-RUN echo 'media-libs/gd jpeg png' >> /etc/portage/package.use
-RUN echo 'net-analyzer/nagios-core lighttpd' >> /etc/portage/package.use
-RUN echo 'net-analyzer/nagios-plugins nagios-dns nagios-ntp nagios-ssh' >> /etc/portage/package.use
-RUN echo 'dev-lang/php cgi' >> /etc/portage/package.use
+RUN mkdir -p /etc/portage/package.use
+RUN echo 'media-libs/gd jpeg png' >> /etc/portage/package.use/nagios
+RUN echo 'net-analyzer/nagios-core lighttpd' >> /etc/portage/package.use/nagios
+RUN echo 'net-analyzer/nagios-plugins nagios-dns nagios-ntp nagios-ssh' >> /etc/portage/package.use/nagios
+RUN echo 'dev-lang/php cgi' >> /etc/portage/package.use/nagios
 RUN emerge -v net-analyzer/nagios
 RUN eselect news read new
 ADD lighttpd-syslog.conf /etc/lighttpd/syslog.conf
diff --git a/ngircd/Dockerfile.template b/ngircd/Dockerfile.template
index 430dcfa..752ac5c 100644
--- a/ngircd/Dockerfile.template
+++ b/ngircd/Dockerfile.template
@@ -25,8 +25,9 @@
 FROM ${NAMESPACE}/gentoo-syslog:${TAG}
 MAINTAINER ${MAINTAINER}
 #VOLUME ["${PORTAGE}:/usr/portage:ro", "${PORTAGE}/distfiles:/usr/portage/distfiles:rw"]
+RUN mkdir -p /etc/portage/package.use
 RUN echo 'net-irc/ngircd ~amd64' >> /etc/portage/package.accept_keywords
-RUN echo 'net-irc/ngircd -pam' >> /etc/portage/package.use
+RUN echo 'net-irc/ngircd -pam' >> /etc/portage/package.use/ngircd
 RUN emerge -v net-irc/ngircd
 RUN eselect news read new
 RUN rc-update add ngircd default
diff --git a/salt/Dockerfile.template b/salt/Dockerfile.template
index d9df89e..df31ca1 100644
--- a/salt/Dockerfile.template
+++ b/salt/Dockerfile.template
@@ -34,7 +34,7 @@ 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
-RUN mkdir /etc/portage/package.use
+RUN mkdir -p /etc/portage/package.use
 RUN echo 'app-admin/salt git' >> /etc/portage/package.use/salt
 ADD package.accept_keywords /etc/portage/package.accept_keywords/salt