From 955a6223ae10c2c35e4aebb8669e84f6201abf0e Mon Sep 17 00:00:00 2001
From: Nick Stenning <nick@whiteink.com>
Date: Thu, 6 Mar 2014 11:56:58 +0100
Subject: [PATCH] Rework Dockerfile to use phusion/baseimage

---
 Dockerfile              | 34 ++++++++++++++++++++--------------
 slapd-start => slapd.sh |  0
 2 files changed, 20 insertions(+), 14 deletions(-)
 rename slapd-start => slapd.sh (100%)

diff --git a/Dockerfile b/Dockerfile
index 7df9510..6c875b9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,26 +1,32 @@
-from	ubuntu:12.04
+FROM phusion/baseimage:0.9.8
+
+ENV HOME /root
+
+# Disable SSH
+RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
+
+# Use baseimage-docker's init system.
+CMD ["/sbin/my_init"]
 
 # Configure apt
-run	echo 'deb http://us.archive.ubuntu.com/ubuntu/ precise universe' >> /etc/apt/sources.list
-run	apt-get -y update
-
-# Don't start slapd on install
-run	echo "#!/bin/sh\nexit 101" >/usr/sbin/policy-rc.d
-run	chmod +x /usr/sbin/policy-rc.d
+RUN echo 'deb http://us.archive.ubuntu.com/ubuntu/ precise universe' >> /etc/apt/sources.list
+RUN apt-get -y update
 
 # Install slapd
-run	LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y slapd
+RUN LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y slapd
 
 # Default configuration: can be overridden at the docker command line
-env	LDAP_ROOTPASS toor
-env	LDAP_ORGANISATION Acme Widgets Inc.
-env	LDAP_DOMAIN example.com
+ENV LDAP_ROOTPASS toor
+ENV LDAP_ORGANISATION Acme Widgets Inc.
+ENV LDAP_DOMAIN example.com
 
-expose 389
+EXPOSE 389
 
-add	./slapd-start /usr/bin/slapd-start
-cmd	["/usr/bin/slapd-start"]
+RUN mkdir /etc/service/slapd
+ADD slapd.sh /etc/service/slapd/run
 
 # To store the data outside the container, mount /var/lib/ldap as a data volume
 
+RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
 # vim:ts=8:noet:
diff --git a/slapd-start b/slapd.sh
similarity index 100%
rename from slapd-start
rename to slapd.sh