diff --git a/puppet/modules/docker/manifests/init.pp b/puppet/modules/docker/manifests/init.pp index 38b40a8e39..d2816907ca 100644 --- a/puppet/modules/docker/manifests/init.pp +++ b/puppet/modules/docker/manifests/init.pp @@ -8,6 +8,7 @@ class docker { Package { ensure => "installed" } package { ["lxc", "debootstrap", "wget", "bsdtar", "git", + "pkg-config", "libsqlite3-dev", "linux-image-3.5.0-25-generic", "linux-image-extra-3.5.0-25-generic", "virtualbox-guest-utils", @@ -42,18 +43,19 @@ class docker { require => [Exec["fetch-docker"], Exec["debootstrap"]] } + file { "/home/vagrant/.profile": + mode => 644, + owner => "vagrant", + group => "vagrant", + content => template("docker/profile"), + } + exec { "copy-docker-bin" : require => Exec["fetch-docker"], command => "/bin/cp /home/vagrant/docker-master/docker /usr/local/bin", creates => "/usr/local/bin/docker" } - exec { "copy-dockerd-bin" : - require => Exec["fetch-docker"], - command => "/bin/cp /home/vagrant/docker-master/dockerd /usr/local/bin", - creates => "/usr/local/bin/dockerd" - } - exec { "vbox-add" : require => Package["linux-headers-3.5.0-25-generic"], command => "/etc/init.d/vboxadd setup",