docker.conf.diff

--- /etc/init/docker.conf	2015-11-20 09:59:03.000000000 -0800
+++ /tmp/puppet-file20160117-19159-rwem9h	2016-01-17 11:23:15.217652295 -0800
@@ -1,60 +1,11 @@
-description "Docker daemon"
+description     "Run docker"
 
-start on (local-filesystems and net-device-up IFACE!=lo)
+start on filesystem or runlevel [2345]
 stop on runlevel [!2345]
-limit nofile 524288 1048576
-limit nproc 524288 1048576
 
 respawn
 
-kill timeout 20
-
-pre-start script
-	# see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
-	if grep -v '^#' /etc/fstab | grep -q cgroup \
-		|| [ ! -e /proc/cgroups ] \
-		|| [ ! -d /sys/fs/cgroup ]; then
-		exit 0
-	fi
-	if ! mountpoint -q /sys/fs/cgroup; then
-		mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
-	fi
-	(
-		cd /sys/fs/cgroup
-		for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
-			mkdir -p $sys
-			if ! mountpoint -q $sys; then
-				if ! mount -n -t cgroup -o $sys cgroup $sys; then
-					rmdir $sys || true
-				fi
-			fi
-		done
-	)
-end script
-
 script
-	# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
-	DOCKER=/usr/bin/$UPSTART_JOB
-	DOCKER_OPTS=
-	if [ -f /etc/default/$UPSTART_JOB ]; then
-		. /etc/default/$UPSTART_JOB
-	fi
-	exec "$DOCKER" daemon $DOCKER_OPTS
+  exec /usr/bin/docker -d  -H unix:///var/run/docker.sock 
 end script
 
-# Don't emit "started" event until docker.sock is ready.
-# See https://github.com/docker/docker/issues/6647
-post-start script
-	DOCKER_OPTS=
-	if [ -f /etc/default/$UPSTART_JOB ]; then
-		. /etc/default/$UPSTART_JOB
-	fi
-	if ! printf "%s" "$DOCKER_OPTS" | grep -qE -e '-H|--host'; then
-		while ! [ -e /var/run/docker.sock ]; do
-			initctl status $UPSTART_JOB | grep -qE "(stop|respawn)/" && exit 1
-			echo "Waiting for /var/run/docker.sock"
-			sleep 0.1
-		done
-		echo "/var/run/docker.sock is up"
-	fi
-end script