From 6f615db6567b6cd1cb7ccb8f1cda2eb786e1ce10 Mon Sep 17 00:00:00 2001
From: Gerhard Lazu <gerhard@lazu.co.uk>
Date: Mon, 30 Sep 2013 12:09:46 +0100
Subject: [PATCH 01/11] Docker has a 42 AUFS layer limit, this limits each
 image to 1 layer

@jpetazzo is this a step in the right direction? dotcloud/docker#2028
---
 Dockerfile.precise    | 11 ++---------
 Dockerfile.ruby-build | 13 ++-----------
 Dockerfile.ruby.1.9   | 12 +++---------
 Dockerfile.ruby.2.0   | 12 +++---------
 4 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/Dockerfile.precise b/Dockerfile.precise
index 22840a2..63695d8 100644
--- a/Dockerfile.precise
+++ b/Dockerfile.precise
@@ -1,11 +1,4 @@
 FROM ubuntu:12.04
-MAINTAINER How are you? "docker@howareyou.com"
+# MAINTAINER How are you? "docker@howareyou.com"
 
-RUN echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90forceyes
-RUN echo 'deb http://archive.ubuntu.com/ubuntu precise main universe' > /etc/apt/sources.list
-RUN apt-get update
-
-RUN dpkg-divert --local --rename --add /sbin/initctl
-RUN ln -s /bin/true /sbin/initctl
-
-RUN apt-get install wget
+RUN echo "export HOME=/root" > /.profile; echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90forceyes; echo 'deb http://archive.ubuntu.com/ubuntu precise main universe' > /etc/apt/sources.list; apt-get update; dpkg-divert --local --rename --add /sbin/initctl; ln -s /bin/true /sbin/initctl; apt-get install wget
diff --git a/Dockerfile.ruby-build b/Dockerfile.ruby-build
index 2218a1a..d63e20e 100644
--- a/Dockerfile.ruby-build
+++ b/Dockerfile.ruby-build
@@ -1,13 +1,4 @@
 FROM howareyou/precise
-MAINTAINER How are you? "docker@howareyou.com"
+# MAINTAINER How are you? "docker@howareyou.com"
 
-ENV RUBY_BUILD_VERSION 20130806
-
-RUN apt-get install build-essential
-RUN apt-get install libssl-dev
-RUN apt-get install zlib1g-dev
-RUN apt-get install libreadline-dev
-RUN apt-get install ca-certificates
-
-RUN wget -O - https://github.com/sstephenson/ruby-build/archive/v$RUBY_BUILD_VERSION.tar.gz | tar -C /usr/local/src -zxv
-RUN cd /usr/local/src/ruby-build-$RUBY_BUILD_VERSION && sh install.sh
+RUN echo "export RUBY_BUILD_VERSION=20130806" >> /.profile; . /.profile; apt-get install build-essential libssl-dev zlib1g-dev libreadline-dev ca-certificates; wget -O - https://github.com/sstephenson/ruby-build/archive/v$RUBY_BUILD_VERSION.tar.gz | tar -C /usr/local/src -zxv; cd /usr/local/src/ruby-build-$RUBY_BUILD_VERSION && sh install.sh
diff --git a/Dockerfile.ruby.1.9 b/Dockerfile.ruby.1.9
index 44f7406..dd2c4fb 100644
--- a/Dockerfile.ruby.1.9
+++ b/Dockerfile.ruby.1.9
@@ -1,10 +1,4 @@
-FROM howareyou/ruby-build_20130806
-MAINTAINER How are you? "docker@howareyou.com"
+FROM howareyou/ruby-build:20130806
+# MAINTAINER How are you? "docker@howareyou.com"
 
-ENV RUBY_VERSION 1.9.3-p448
-ENV PATH /usr/local/lib/$RUBY_VERSION/bin:$PATH
-
-RUN ruby-build -v $RUBY_VERSION /usr/local/lib/$RUBY_VERSION
-
-RUN echo "gem: --no-rdoc --no-ri" > /root/.gemrc
-RUN gem install bundler foreman pry
+RUN echo "export RUBY_VERSION=1.9.3-p448" >> /.profile; echo "export PATH=/usr/local/lib/$RUBY_VERSION/bin:$PATH" >> /.profile; . /.profile; ruby-build -v $RUBY_VERSION /usr/local/lib/$RUBY_VERSION; echo "gem: --no-rdoc --no-ri" > /root/.gemrc; gem install bundler foreman pry
diff --git a/Dockerfile.ruby.2.0 b/Dockerfile.ruby.2.0
index c0f39dc..493a359 100644
--- a/Dockerfile.ruby.2.0
+++ b/Dockerfile.ruby.2.0
@@ -1,10 +1,4 @@
-FROM howareyou/ruby-build_20130806
-MAINTAINER How are you? "docker@howareyou.com"
+FROM howareyou/ruby-build:20130806
+# MAINTAINER How are you? "docker@howareyou.com"
 
-ENV RUBY_VERSION 2.0.0-p247
-ENV PATH /usr/local/lib/$RUBY_VERSION/bin:$PATH
-
-RUN ruby-build -v $RUBY_VERSION /usr/local/lib/$RUBY_VERSION
-
-RUN echo "gem: --no-rdoc --no-ri" > /root/.gemrc
-RUN gem install bundler foreman pry
+RUN echo "export RUBY_VERSION=2.0.0-p247" >> /.profile; echo "export PATH=/usr/local/lib/$RUBY_VERSION/bin:$PATH" >> /.profile; . /.profile; ruby-build -v $RUBY_VERSION /usr/local/lib/$RUBY_VERSION; echo "gem: --no-rdoc --no-ri" > /root/.gemrc; gem install bundler foreman pry

From eeea41dffb2de8064c80b3bf5ee1ed56daa587b0 Mon Sep 17 00:00:00 2001
From: Gerhard Lazu <gerhard@lazu.co.uk>
Date: Mon, 30 Sep 2013 18:10:12 +0100
Subject: [PATCH 02/11] Former precise Dockerfile, more consistent with the
 ubuntu:12,04 image

---
 Dockerfile.ubuntu | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 Dockerfile.ubuntu

diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
new file mode 100644
index 0000000..63695d8
--- /dev/null
+++ b/Dockerfile.ubuntu
@@ -0,0 +1,4 @@
+FROM ubuntu:12.04
+# MAINTAINER How are you? "docker@howareyou.com"
+
+RUN echo "export HOME=/root" > /.profile; echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90forceyes; echo 'deb http://archive.ubuntu.com/ubuntu precise main universe' > /etc/apt/sources.list; apt-get update; dpkg-divert --local --rename --add /sbin/initctl; ln -s /bin/true /sbin/initctl; apt-get install wget

From 1edbc0184c0406bb88517cd88fc81a21c65226d4 Mon Sep 17 00:00:00 2001
From: Gerhard Lazu <gerhard@lazu.co.uk>
Date: Mon, 30 Sep 2013 18:11:07 +0100
Subject: [PATCH 03/11] Using the new howareyou/ubuntu:12.04 image

Fixed export & profile sourcing
---
 Dockerfile.ruby-build | 2 +-
 Dockerfile.ruby.1.9   | 2 +-
 Dockerfile.ruby.2.0   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile.ruby-build b/Dockerfile.ruby-build
index d63e20e..9fee8b9 100644
--- a/Dockerfile.ruby-build
+++ b/Dockerfile.ruby-build
@@ -1,4 +1,4 @@
-FROM howareyou/precise
+FROM howareyou/ubuntu:12.04
 # MAINTAINER How are you? "docker@howareyou.com"
 
 RUN echo "export RUBY_BUILD_VERSION=20130806" >> /.profile; . /.profile; apt-get install build-essential libssl-dev zlib1g-dev libreadline-dev ca-certificates; wget -O - https://github.com/sstephenson/ruby-build/archive/v$RUBY_BUILD_VERSION.tar.gz | tar -C /usr/local/src -zxv; cd /usr/local/src/ruby-build-$RUBY_BUILD_VERSION && sh install.sh
diff --git a/Dockerfile.ruby.1.9 b/Dockerfile.ruby.1.9
index dd2c4fb..1108ff9 100644
--- a/Dockerfile.ruby.1.9
+++ b/Dockerfile.ruby.1.9
@@ -1,4 +1,4 @@
 FROM howareyou/ruby-build:20130806
 # MAINTAINER How are you? "docker@howareyou.com"
 
-RUN echo "export RUBY_VERSION=1.9.3-p448" >> /.profile; echo "export PATH=/usr/local/lib/$RUBY_VERSION/bin:$PATH" >> /.profile; . /.profile; ruby-build -v $RUBY_VERSION /usr/local/lib/$RUBY_VERSION; echo "gem: --no-rdoc --no-ri" > /root/.gemrc; gem install bundler foreman pry
+RUN export RUBY_VERSION=1.9.3-p448; echo "export RUBY_VERSION=$RUBY_VERSION" >> /.profile; echo "export PATH=/usr/local/lib/$RUBY_VERSION/bin:$PATH" >> /.profile; . /.profile; ruby-build -v $RUBY_VERSION /usr/local/lib/$RUBY_VERSION; echo "gem: --no-rdoc --no-ri" > /root/.gemrc; gem install bundler foreman pry
diff --git a/Dockerfile.ruby.2.0 b/Dockerfile.ruby.2.0
index 493a359..da3cc69 100644
--- a/Dockerfile.ruby.2.0
+++ b/Dockerfile.ruby.2.0
@@ -1,4 +1,4 @@
 FROM howareyou/ruby-build:20130806
 # MAINTAINER How are you? "docker@howareyou.com"
 
-RUN echo "export RUBY_VERSION=2.0.0-p247" >> /.profile; echo "export PATH=/usr/local/lib/$RUBY_VERSION/bin:$PATH" >> /.profile; . /.profile; ruby-build -v $RUBY_VERSION /usr/local/lib/$RUBY_VERSION; echo "gem: --no-rdoc --no-ri" > /root/.gemrc; gem install bundler foreman pry
+RUN export RUBY_VERSION=2.0.0-p247; echo "export RUBY_VERSION=2.0.0-p247" >> /.profile; echo "export PATH=/usr/local/lib/$RUBY_VERSION/bin:$PATH" >> /.profile; . /.profile; ruby-build -v $RUBY_VERSION /usr/local/lib/$RUBY_VERSION; echo "gem: --no-rdoc --no-ri" > /root/.gemrc; gem install bundler foreman pry

From 0eb79f1dbb36100f5639d463dbabf60c9739fdf8 Mon Sep 17 00:00:00 2001
From: Gerhard Lazu <gerhard@lazu.co.uk>
Date: Tue, 1 Oct 2013 00:36:34 +0100
Subject: [PATCH 04/11] Getting back the multi-line: yay!

---
 Dockerfile.ubuntu | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index 63695d8..f538f69 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -1,4 +1,10 @@
 FROM ubuntu:12.04
 # MAINTAINER How are you? "docker@howareyou.com"
 
-RUN echo "export HOME=/root" > /.profile; echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90forceyes; echo 'deb http://archive.ubuntu.com/ubuntu precise main universe' > /etc/apt/sources.list; apt-get update; dpkg-divert --local --rename --add /sbin/initctl; ln -s /bin/true /sbin/initctl; apt-get install wget
+RUN echo "export HOME=/root" > /.profile;\
+echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90forceyes;\
+echo 'deb http://archive.ubuntu.com/ubuntu precise main universe' > /etc/apt/sources.list;\
+apt-get update;\
+dpkg-divert --local --rename --add /sbin/initctl;\
+ln -s /bin/true /sbin/initctl;\
+apt-get install wget

From b5e8ca71c0c94c4dd14755a2a266ae2e0f56a5fa Mon Sep 17 00:00:00 2001
From: Gerhard Lazu <gerhard@lazu.co.uk>
Date: Tue, 1 Oct 2013 09:43:33 +0100
Subject: [PATCH 05/11] Broken down the sausage lines (yes, they were ugly!)

---
 Dockerfile.ruby-build | 7 ++++++-
 Dockerfile.ruby.1.9   | 8 +++++++-
 Dockerfile.ruby.2.0   | 8 +++++++-
 3 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/Dockerfile.ruby-build b/Dockerfile.ruby-build
index 9fee8b9..22cc964 100644
--- a/Dockerfile.ruby-build
+++ b/Dockerfile.ruby-build
@@ -1,4 +1,9 @@
 FROM howareyou/ubuntu:12.04
 # MAINTAINER How are you? "docker@howareyou.com"
 
-RUN echo "export RUBY_BUILD_VERSION=20130806" >> /.profile; . /.profile; apt-get install build-essential libssl-dev zlib1g-dev libreadline-dev ca-certificates; wget -O - https://github.com/sstephenson/ruby-build/archive/v$RUBY_BUILD_VERSION.tar.gz | tar -C /usr/local/src -zxv; cd /usr/local/src/ruby-build-$RUBY_BUILD_VERSION && sh install.sh
+RUN echo "export RUBY_BUILD_VERSION=20130806" >> /.profile;\
+. /.profile;\
+apt-get install build-essential libssl-dev zlib1g-dev libreadline-dev ca-certificates;\
+ruby_build_url="https://github.com/sstephenson/ruby-build/archive/v$RUBY_BUILD_VERSION.tar.gz";\
+wget -O - $ruby_build_url | tar -C /usr/local/src -zxv;\
+cd /usr/local/src/ruby-build-$RUBY_BUILD_VERSION && sh install.sh
diff --git a/Dockerfile.ruby.1.9 b/Dockerfile.ruby.1.9
index 1108ff9..0b9a835 100644
--- a/Dockerfile.ruby.1.9
+++ b/Dockerfile.ruby.1.9
@@ -1,4 +1,10 @@
 FROM howareyou/ruby-build:20130806
 # MAINTAINER How are you? "docker@howareyou.com"
 
-RUN export RUBY_VERSION=1.9.3-p448; echo "export RUBY_VERSION=$RUBY_VERSION" >> /.profile; echo "export PATH=/usr/local/lib/$RUBY_VERSION/bin:$PATH" >> /.profile; . /.profile; ruby-build -v $RUBY_VERSION /usr/local/lib/$RUBY_VERSION; echo "gem: --no-rdoc --no-ri" > /root/.gemrc; gem install bundler foreman pry
+RUN export RUBY_VERSION=1.9.3-p448;\
+echo "export RUBY_VERSION=$RUBY_VERSION" >> /.profile;\
+echo "export PATH=/usr/local/lib/$RUBY_VERSION/bin:$PATH" >> /.profile;\
+. /.profile;\
+ruby-build -v $RUBY_VERSION /usr/local/lib/$RUBY_VERSION;\
+echo "gem: --no-rdoc --no-ri" > /root/.gemrc;\
+gem install bundler foreman pry
diff --git a/Dockerfile.ruby.2.0 b/Dockerfile.ruby.2.0
index da3cc69..a606536 100644
--- a/Dockerfile.ruby.2.0
+++ b/Dockerfile.ruby.2.0
@@ -1,4 +1,10 @@
 FROM howareyou/ruby-build:20130806
 # MAINTAINER How are you? "docker@howareyou.com"
 
-RUN export RUBY_VERSION=2.0.0-p247; echo "export RUBY_VERSION=2.0.0-p247" >> /.profile; echo "export PATH=/usr/local/lib/$RUBY_VERSION/bin:$PATH" >> /.profile; . /.profile; ruby-build -v $RUBY_VERSION /usr/local/lib/$RUBY_VERSION; echo "gem: --no-rdoc --no-ri" > /root/.gemrc; gem install bundler foreman pry
+RUN export RUBY_VERSION=2.0.0-p247;\
+echo "export RUBY_VERSION=$RUBY_VERSION" >> /.profile;\
+echo "export PATH=/usr/local/lib/$RUBY_VERSION/bin:$PATH" >> /.profile;\
+. /.profile;\
+ruby-build -v $RUBY_VERSION /usr/local/lib/$RUBY_VERSION;\
+echo "gem: --no-rdoc --no-ri" > /root/.gemrc;\
+gem install bundler foreman pry

From c803d418edbb374e2ccd370993d2d79605608773 Mon Sep 17 00:00:00 2001
From: Gerhard Lazu <gerhard@lazu.co.uk>
Date: Tue, 1 Oct 2013 11:46:59 +0100
Subject: [PATCH 06/11] Cleaner multi-line RUN syntax

https://github.com/dotcloud/docker/issues/2028#issuecomment-25438520
---
 Dockerfile.ruby-build | 14 ++++++++------
 Dockerfile.ruby.1.9   | 16 +++++++++-------
 Dockerfile.ruby.2.0   | 16 +++++++++-------
 Dockerfile.ubuntu     | 16 +++++++++-------
 4 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/Dockerfile.ruby-build b/Dockerfile.ruby-build
index 22cc964..c2bfe7b 100644
--- a/Dockerfile.ruby-build
+++ b/Dockerfile.ruby-build
@@ -1,9 +1,11 @@
 FROM howareyou/ubuntu:12.04
 # MAINTAINER How are you? "docker@howareyou.com"
 
-RUN echo "export RUBY_BUILD_VERSION=20130806" >> /.profile;\
-. /.profile;\
-apt-get install build-essential libssl-dev zlib1g-dev libreadline-dev ca-certificates;\
-ruby_build_url="https://github.com/sstephenson/ruby-build/archive/v$RUBY_BUILD_VERSION.tar.gz";\
-wget -O - $ruby_build_url | tar -C /usr/local/src -zxv;\
-cd /usr/local/src/ruby-build-$RUBY_BUILD_VERSION && sh install.sh
+RUN \
+  echo "export RUBY_BUILD_VERSION=20130806" >> /.profile ;\
+  . /.profile ;\
+  apt-get install build-essential libssl-dev zlib1g-dev libreadline-dev ca-certificates ;\
+  ruby_build_url="https://github.com/sstephenson/ruby-build/archive/v$RUBY_BUILD_VERSION.tar.gz" ;\
+  wget -O - $ruby_build_url | tar -C /usr/local/src -zxv ;\
+  cd /usr/local/src/ruby-build-$RUBY_BUILD_VERSION && sh install.sh
+# END RUN
diff --git a/Dockerfile.ruby.1.9 b/Dockerfile.ruby.1.9
index 0b9a835..2ddbea1 100644
--- a/Dockerfile.ruby.1.9
+++ b/Dockerfile.ruby.1.9
@@ -1,10 +1,12 @@
 FROM howareyou/ruby-build:20130806
 # MAINTAINER How are you? "docker@howareyou.com"
 
-RUN export RUBY_VERSION=1.9.3-p448;\
-echo "export RUBY_VERSION=$RUBY_VERSION" >> /.profile;\
-echo "export PATH=/usr/local/lib/$RUBY_VERSION/bin:$PATH" >> /.profile;\
-. /.profile;\
-ruby-build -v $RUBY_VERSION /usr/local/lib/$RUBY_VERSION;\
-echo "gem: --no-rdoc --no-ri" > /root/.gemrc;\
-gem install bundler foreman pry
+RUN \
+  export RUBY_VERSION=1.9.3-p448 ;\
+  echo "export RUBY_VERSION=$RUBY_VERSION" >> /.profile ;\
+  echo "export PATH=/usr/local/lib/$RUBY_VERSION/bin:$PATH" >> /.profile ;\
+  . /.profile ;\
+  ruby-build -v $RUBY_VERSION /usr/local/lib/$RUBY_VERSION ;\
+  echo "gem: --no-rdoc --no-ri" > /root/.gemrc ;\
+  gem install bundler foreman pry ;\
+# END RUN
diff --git a/Dockerfile.ruby.2.0 b/Dockerfile.ruby.2.0
index a606536..eaf415f 100644
--- a/Dockerfile.ruby.2.0
+++ b/Dockerfile.ruby.2.0
@@ -1,10 +1,12 @@
 FROM howareyou/ruby-build:20130806
 # MAINTAINER How are you? "docker@howareyou.com"
 
-RUN export RUBY_VERSION=2.0.0-p247;\
-echo "export RUBY_VERSION=$RUBY_VERSION" >> /.profile;\
-echo "export PATH=/usr/local/lib/$RUBY_VERSION/bin:$PATH" >> /.profile;\
-. /.profile;\
-ruby-build -v $RUBY_VERSION /usr/local/lib/$RUBY_VERSION;\
-echo "gem: --no-rdoc --no-ri" > /root/.gemrc;\
-gem install bundler foreman pry
+RUN \
+  export RUBY_VERSION=2.0.0-p247 ;\
+  echo "export RUBY_VERSION=$RUBY_VERSION" >> /.profile ;\
+  echo "export PATH=/usr/local/lib/$RUBY_VERSION/bin:$PATH" >> /.profile ;\
+  . /.profile ;\
+  ruby-build -v $RUBY_VERSION /usr/local/lib/$RUBY_VERSION ;\
+  echo "gem: --no-rdoc --no-ri" > /root/.gemrc ;\
+  gem install bundler foreman pry ;\
+# END RUN
diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
index f538f69..793ac28 100644
--- a/Dockerfile.ubuntu
+++ b/Dockerfile.ubuntu
@@ -1,10 +1,12 @@
 FROM ubuntu:12.04
 # MAINTAINER How are you? "docker@howareyou.com"
 
-RUN echo "export HOME=/root" > /.profile;\
-echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90forceyes;\
-echo 'deb http://archive.ubuntu.com/ubuntu precise main universe' > /etc/apt/sources.list;\
-apt-get update;\
-dpkg-divert --local --rename --add /sbin/initctl;\
-ln -s /bin/true /sbin/initctl;\
-apt-get install wget
+RUN \
+  echo "export HOME=/root" > /.profile ;\
+  echo 'APT::Get::Assume-Yes "true";' > /etc/apt/apt.conf.d/90forceyes ;\
+  echo 'deb http://archive.ubuntu.com/ubuntu precise main universe' > /etc/apt/sources.list ;\
+  apt-get update ;\
+  dpkg-divert --local --rename --add /sbin/initctl ;\
+  ln -s /bin/true /sbin/initctl ;\
+  apt-get install wget ;\
+# END RUN

From c4bf9632fb1cf29c8598ff7499b8916208d44bc2 Mon Sep 17 00:00:00 2001
From: Gerhard Lazu <gerhard@lazu.co.uk>
Date: Thu, 3 Oct 2013 23:23:53 +0100
Subject: [PATCH 07/11] Minimal AUFS layers for redis image

---
 Dockerfile.redis | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/Dockerfile.redis b/Dockerfile.redis
index 5fcbe07..3999b54 100644
--- a/Dockerfile.redis
+++ b/Dockerfile.redis
@@ -1,11 +1,12 @@
-FROM howareyou/precise
-MAINTAINER How are you? "docker@howareyou.com"
+FROM howareyou/ubuntu:12.04
+# MAINTAINER How are you? "docker@howareyou.com"
 
-ENV REDIS_VERSION 2.6.16
-
-RUN apt-get install build-essential
-RUN wget -O - http://download.redis.io/releases/redis-$REDIS_VERSION.tar.gz | tar -C /usr/local/src -zxv
-RUN cd /usr/local/src/redis-$REDIS_VERSION && make && make install
-RUN sysctl vm.overcommit_memory=1
+RUN \
+  export REDIS_VERSION=2.6.16 ;\
+  apt-get install build-essential ;\
+  wget -O - http://download.redis.io/releases/redis-$REDIS_VERSION.tar.gz | tar -C /usr/local/src -zxv ;\
+  cd /usr/local/src/redis-$REDIS_VERSION && make && make install ;\
+  sysctl vm.overcommit_memory=1 ;\
+# END RUN
 
 CMD redis-server

From 33d958067222ccd888d3c9e8ac85fcb1b0fa5851 Mon Sep 17 00:00:00 2001
From: Gerhard Lazu <gerhard@lazu.co.uk>
Date: Sat, 14 Dec 2013 20:52:44 +0000
Subject: [PATCH 08/11] MySQL build as a single layer

---
 mysql/Dockerfile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/mysql/Dockerfile b/mysql/Dockerfile
index 73a548d..59c4071 100644
--- a/mysql/Dockerfile
+++ b/mysql/Dockerfile
@@ -1,13 +1,12 @@
-FROM howareyou/precise
-MAINTAINER How are you? "docker@howareyou.com"
+FROM howareyou/ubuntu:12.04
+# MAINTAINER How are you? "docker@howareyou.com"
 
-ENV DEBIAN_FRONTEND noninteractive
-
-RUN echo "mysql-server-5.5 mysql-server/start_on_boot boolean false" | debconf-set-selections
-
-RUN chmod 777 /tmp
-
-RUN apt-get -q install mysql-server-5.5
+RUN \
+  . /.profile ;\
+  echo "mysql-server-5.5 mysql-server/start_on_boot boolean false" | debconf-set-selections ;\
+  chmod 777 /tmp ;\
+  apt-get install mysql-server-5.5 ;\
+# END RUN
 
 ADD mysql-listen.cnf /etc/mysql/conf.d/mysql-listen.cnf
 ADD mysqld_start /mysqld_start

From e7b8b060947d86cd10c172ec59de3aa837504ee1 Mon Sep 17 00:00:00 2001
From: Gerhard Lazu <gerhard@lazu.co.uk>
Date: Sat, 14 Dec 2013 20:53:36 +0000
Subject: [PATCH 09/11] Updated ruby-build

Including more system libs, gems with native extensions were failing to
build properly
---
 Dockerfile.ruby-build | 8 ++++++--
 Dockerfile.ruby.1.9   | 2 +-
 Dockerfile.ruby.2.0   | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.ruby-build b/Dockerfile.ruby-build
index c2bfe7b..aadc864 100644
--- a/Dockerfile.ruby-build
+++ b/Dockerfile.ruby-build
@@ -2,9 +2,13 @@ FROM howareyou/ubuntu:12.04
 # MAINTAINER How are you? "docker@howareyou.com"
 
 RUN \
-  echo "export RUBY_BUILD_VERSION=20130806" >> /.profile ;\
+  echo "export RUBY_BUILD_VERSION=20131024" >> /.profile ;\
   . /.profile ;\
-  apt-get install build-essential libssl-dev zlib1g-dev libreadline-dev ca-certificates ;\
+  apt-get install build-essential libffi-dev libreadline-dev libyaml-dev zlib1g-dev ;\
+  apt-get install libsqlite3-dev libmysqlclient-dev libmemcached-dev libmagickwand-dev ;\
+  apt-get install libev-dev libevent-dev ;\
+  apt-get install libssl-dev libcurl4-openssl-dev curl openssl ca-certificates ;\
+  apt-get install libxml2 libxml2-dev libxslt1-dev ;\
   ruby_build_url="https://github.com/sstephenson/ruby-build/archive/v$RUBY_BUILD_VERSION.tar.gz" ;\
   wget -O - $ruby_build_url | tar -C /usr/local/src -zxv ;\
   cd /usr/local/src/ruby-build-$RUBY_BUILD_VERSION && sh install.sh
diff --git a/Dockerfile.ruby.1.9 b/Dockerfile.ruby.1.9
index 2ddbea1..16abc1e 100644
--- a/Dockerfile.ruby.1.9
+++ b/Dockerfile.ruby.1.9
@@ -1,4 +1,4 @@
-FROM howareyou/ruby-build:20130806
+FROM howareyou/ruby-build:20131024
 # MAINTAINER How are you? "docker@howareyou.com"
 
 RUN \
diff --git a/Dockerfile.ruby.2.0 b/Dockerfile.ruby.2.0
index eaf415f..5ebb326 100644
--- a/Dockerfile.ruby.2.0
+++ b/Dockerfile.ruby.2.0
@@ -1,4 +1,4 @@
-FROM howareyou/ruby-build:20130806
+FROM howareyou/ruby-build:20131024
 # MAINTAINER How are you? "docker@howareyou.com"
 
 RUN \

From 5baf17bcc156326d516256290c90f16c2d50c349 Mon Sep 17 00:00:00 2001
From: Gerhard Lazu <gerhard@lazu.co.uk>
Date: Sat, 14 Dec 2013 20:54:14 +0000
Subject: [PATCH 10/11] redis container will always expose 6379

---
 Dockerfile.redis | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Dockerfile.redis b/Dockerfile.redis
index 3999b54..dee3973 100644
--- a/Dockerfile.redis
+++ b/Dockerfile.redis
@@ -10,3 +10,4 @@ RUN \
 # END RUN
 
 CMD redis-server
+EXPOSE 6379

From b61ce5fcf3516e912298b26f40fe381058e74b27 Mon Sep 17 00:00:00 2001
From: Gerhard Lazu <gerhard@lazu.co.uk>
Date: Sat, 14 Dec 2013 20:54:29 +0000
Subject: [PATCH 11/11] Supervisor image, WIP

---
 supervisor/Dockerfile       | 8 ++++++++
 supervisor/supervisord.conf | 9 +++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 supervisor/Dockerfile
 create mode 100644 supervisor/supervisord.conf

diff --git a/supervisor/Dockerfile b/supervisor/Dockerfile
new file mode 100644
index 0000000..4052d3c
--- /dev/null
+++ b/supervisor/Dockerfile
@@ -0,0 +1,8 @@
+FROM ubuntu:12.04
+MAINTAINER How are you? "docker@howareyou.com"
+
+RUN apt-get install -y python-setuptools
+RUN easy_install supervisor
+ADD ./supervisord.conf /etc/supervisord.conf
+
+CMD /usr/local/bin/supervisord -c /etc/supervisord.conf
diff --git a/supervisor/supervisord.conf b/supervisor/supervisord.conf
new file mode 100644
index 0000000..94bbdce
--- /dev/null
+++ b/supervisor/supervisord.conf
@@ -0,0 +1,9 @@
+[supervisord]
+logfile=/var/log/supervisord.log  ; (main log file;default $CWD/supervisord.log)
+logfile_maxbytes=1MB              ; (max main logfile bytes b4 rotation;default 50MB)
+logfile_backups=10                ; (num of main logfile rotation backups;default 10)
+loglevel=info                     ; (log level;default info; others: debug,warn,trace)
+pidfile=/tmp/supervisord.pid      ; (supervisord pidfile;default supervisord.pid)
+nodaemon=true                     ; (start in foreground if true;default false)
+minfds=1024                       ; (min. avail startup file descriptors;default 1024)
+minprocs=200                      ; (min. avail process descriptors;default 200)