gentoo-utc: Setup /etc/timezone and /etc/localtime

Following the Gentoo x86 install guide [1].  This avoids errors like:

  [Sun Mar 02 2014 20:22:48 GMT+0000 (Local time zone must be set--see zic manual page)] ...

Which I was getting in my hubot logs.

[1]: http://www.gentoo.org/doc/en/handbook/handbook-x86.xml?part=1&chap=6#doc_chap4

diff --git a/README.md b/README.md
index 77feb3d5877f238649e896844737dfc9b1339115..08e81336e537aa630c1edf19fc2bb7aab6b2d0af 100644 (file)
--- a/README.md
+++ b/README.md
@@ -18,25 +18,26 @@ The dependency graph is:
 
     wking/gentoo  (amd64 stage3)
     `-- gentoo-portage  (adds portage directory)
-        `-- gentoo-en-us  (adds locale)
-            `-- gentoo-syslog  (adds syslog-ng and associates)
-                |-- buildbot  (adds a Buildbot master and slave)
-                |-- docker-registry  (adds a Docker registry server)
-                |-- gentoo-layman  (adds layman for Gentoo overlays)
-                |   `-- package-cache  (adds a package-cache proxy)
-                |-- hubot  (adds hubot with an IRC adapter)
-                |-- memcached  (adds Memcached)
-                |-- nginx  (adds Nginx)
-                |   |-- nginx-proxy  (SSL/TLS proxying via SNI)
-                |   |-- kibana  (adds Kibana)
-                |   `-- kibana-azure  (adds Azure's Kibana)
-                |-- ngircd  (adds ngIRCd)
-                |-- postgresql  (adds PostgreSQL)
-                |-- redis  (adds Redis)
-                |-- salt-minion  (adds a Salt Stack minion)
-                |-- stunnel  (adds stunnel)
-                `-- gentoo-java  (adds IcedTea)
-                    `-- elasticsearch  (adds Elasticsearch)
+        `-- gentoo-utc  (adds a system timezone)
+            `-- gentoo-en-us  (adds locale)
+                `-- gentoo-syslog  (adds syslog-ng and associates)
+                    |-- buildbot  (adds a Buildbot master and slave)
+                    |-- docker-registry  (adds a Docker registry server)
+                    |-- gentoo-layman  (adds layman for Gentoo overlays)
+                    |   `-- package-cache  (adds a package-cache proxy)
+                    |-- hubot  (adds hubot with an IRC adapter)
+                    |-- memcached  (adds Memcached)
+                    |-- nginx  (adds Nginx)
+                    |   |-- nginx-proxy  (SSL/TLS proxying via SNI)
+                    |   |-- kibana  (adds Kibana)
+                    |   `-- kibana-azure  (adds Azure's Kibana)
+                    |-- ngircd  (adds ngIRCd)
+                    |-- postgresql  (adds PostgreSQL)
+                    |-- redis  (adds Redis)
+                    |-- salt-minion  (adds a Salt Stack minion)
+                    |-- stunnel  (adds stunnel)
+                    `-- gentoo-java  (adds IcedTea)
+                        `-- elasticsearch  (adds Elasticsearch)
 
 Run:
 

diff --git a/build.sh b/build.sh
index 3b249f19ca268a8625db54dbde6185b305dfa9e8..22ad7702133457edf7b503757325973d3f55a000 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -43,6 +43,7 @@ BUILD_OPTS="${BUILD_OPTS:-}"
 REPOS="${REPOS:-
        portage
        gentoo-portage
+       gentoo-utc
        gentoo-en-us
        gentoo-syslog
        gentoo-java

diff --git a/gentoo-en-us/Dockerfile.template b/gentoo-en-us/Dockerfile.template
index cb595fd85fca5c773a9085fbfc878b8b28230cd5..4bb5be33f3b07a98b57ebe26de90a6d437ba0618 100644 (file)
--- a/gentoo-en-us/Dockerfile.template
+++ b/gentoo-en-us/Dockerfile.template
@@ -1,4 +1,4 @@
-# Copyright (C) 2013 W. Trevor King <wking@tremily.us>
+# Copyright (C) 2013-2014 W. Trevor King <wking@tremily.us>
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -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-portage:${TAG}
+FROM ${NAMESPACE}/gentoo-utc:${TAG}
 MAINTAINER ${MAINTAINER}
 #VOLUME ["${PORTAGE}:/usr/portage:ro", "${PORTAGE}/distfiles:/usr/portage/distfiles:rw"]
 RUN echo en_US ISO-8859-1 > /etc/locale.gen

diff --git a/gentoo-utc/Dockerfile.template b/gentoo-utc/Dockerfile.template
new file mode 100644 (file)
index 0000000..8b65b7b
--- /dev/null
+++ b/gentoo-utc/Dockerfile.template
@@ -0,0 +1,29 @@
+# Copyright (C) 2014 W. Trevor King <wking@tremily.us>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# * Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+
+FROM ${NAMESPACE}/gentoo-portage:${TAG}
+MAINTAINER ${MAINTAINER}
+#VOLUME ["${PORTAGE}:/usr/portage:ro", "${PORTAGE}/distfiles:/usr/portage/distfiles:rw"]
+RUN echo 'UTC' > /etc/timezone
+RUN emerge --config sys-libs/timezone-data