X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=README.md;h=38199d1c80809a85abbced835120371594378a42;hb=afa78a6e80a302a96b71f4081b226127dcbdd6c5;hp=95d562b66d8a5aea349448b2f36417b3e3d5d6bf;hpb=5b43ad920f63b8cda768a4d31798084a69c08a63;p=dockerfile.git

diff --git a/README.md b/README.md
index 95d562b..38199d1 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,10 @@
 Dockerfiles are sorted into directories with names matching the
 suggested repository.  To avoid duplicating ephemeral data (namespace,
 timestamp tag, …), they appear in the `Dockerfile.template` as markers
-(`NAMESPACE`, `TAG`, …).  The `build.sh` script replaces the markers
-with values while generating a `Dockerfile` from each
-`Dockerfile.template`, and then builds each tag with:
+(`${NAMESPACE}`, `${TAG}`, …).  The `build.sh` script replaces the
+markers with values while generating a `Dockerfile` from each
+`Dockerfile.template` (using [envsubst][]), and then builds each tag
+with:
 
     $ docker build -t $NAMESPACE/$REPO:$TAG $REPO
 
@@ -17,10 +18,30 @@ 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)
-                `-- redis  (adds Redis)
+        `-- gentoo-python (drops Python 2.7)
+            `-- gentoo-utc  (adds a system timezone)
+                `-- gentoo-en-us  (adds locale)
+                    `-- gentoo-openrc  (configure OpenRC for Docker)
+                        `-- 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)
+                            |-- gentoo-node  (adds Node and npm)
+                            |   `-- hubot  (adds hubot with an IRC adapter)
+                            |-- irker  (adds irker, and spawns irkerd by default)
+                            |-- 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:
 
@@ -35,11 +56,11 @@ as you see fit.
     $ NAMESPACE=jdoe DATE=20131210 ./build.sh
 
 I'd like to avoid bloating the images with the Portage tree, but
-without ugly hacks [that is not currently possible][3156] is mounted
-from the host.
+without ugly hacks [that is not currently possible][3156].
 
 [Docker]: http://www.docker.io/
 [Dockerfiles]: http://www.docker.io/learn/dockerfile/
 [Gentoo]: http://www.gentoo.org/
+[envsubst]: http://www.gnu.org/software/gettext/manual/html_node/envsubst-Invocation.html
 [parameter-expansion]: http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_06_02
 [3156]: https://github.com/dotcloud/docker/issues/3156