From 9542876d2f22e73a52b4957d1a8ca6b17d5c83e7 Mon Sep 17 00:00:00 2001 From: Shawn Siefkas Date: Fri, 22 Mar 2013 08:48:50 -0500 Subject: [PATCH 1/2] Waiting to start docker until the fresh binaries have been copied in --- puppet/modules/docker/manifests/init.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppet/modules/docker/manifests/init.pp b/puppet/modules/docker/manifests/init.pp index 1862c524b8..6f8d249ff7 100644 --- a/puppet/modules/docker/manifests/init.pp +++ b/puppet/modules/docker/manifests/init.pp @@ -80,7 +80,7 @@ class docker { owner => "root", group => "root", content => template("docker/dockerd.conf"), - require => Exec["fetch-docker"], + require => Exec["copy-docker-bin"], } file { "/home/vagrant": From cff01ec5ec3210f2faec3715bf1b07182bcc571c Mon Sep 17 00:00:00 2001 From: Shawn Siefkas Date: Fri, 22 Mar 2013 08:49:28 -0500 Subject: [PATCH 2/2] Redirecting docker daemon stdout/stderr to /var/log/dockerd --- puppet/modules/docker/templates/dockerd.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppet/modules/docker/templates/dockerd.conf b/puppet/modules/docker/templates/dockerd.conf index 2d77c301f0..f88d5c347f 100644 --- a/puppet/modules/docker/templates/dockerd.conf +++ b/puppet/modules/docker/templates/dockerd.conf @@ -8,5 +8,5 @@ respawn script test -f /etc/default/locale && . /etc/default/locale || true - LANG=$LANG LC_ALL=$LANG /usr/local/bin/docker -d + LANG=$LANG LC_ALL=$LANG /usr/local/bin/docker -d >> /var/log/dockerd 2>&1 end script