docker-provider 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ecc63749fe1c7951f04eecbcedc6579fcec0db7
-  data.tar.gz: fbdb3556de90b576e1b3613e4de96791599963fc
+  metadata.gz: 75f8540cb7ab18e1d6592fc46a2dd3ef6675f766
+  data.tar.gz: d098ade4f9e92f805ac2f479b354e4dc436c2be6
 SHA512:
-  metadata.gz: 575626e4f52623abc118e4feee9df5faa2f4a82c1adacd449b2c657b38e1a07ecd233f24bfd381d8a9c64259675425f66adbf82dbe4e33b35bd1026043e1eee1
-  data.tar.gz: 8f457fe8e793b59ad56c8e575cb7d2497a65d96a5545f23390e5c5e8ac053bbbc9e35cbd09b04e30a894965dd4b050c6757d0692d67aa9aae16311b92fe39c50
+  metadata.gz: 4582b7287bad91333f450a779ad56ee9db01df6511ca8386146485c8e1a34747a32fd1a2439679b16663b862047e45475b766ad55c0d41e03fd05d15374347ad
+  data.tar.gz: 83c0bc91abbf40202ba6944d76910bbf845fe6b39ad8754ec53e112d372c1bee2fc71cb7f93c2b7a989a18a8d29a297e22d34fe14870a7f375d8c73ffd3c2f31

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [0.0.2](https://github.com/fgrehm/docker-provider/compare/v0.0.1...v0.0.2) (November 5, 2013)
+
+  - Fix provisioning with Vagrant's built in provisioners
+
 ## 0.0.1 (November 5, 2013)
 
   - Initial public release.

data/Gemfile.lock

@@ -50,7 +50,7 @@ GIT
 PATH
   remote: .
   specs:
-    docker-provider (0.0.1)
+    docker-provider (0.0.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -75,8 +75,10 @@ There's probably a whole lot of limitations right now but during these early day
 of the plugin I can tell you for sure that some things are probably not going to
 work as you might expect. For instance forwarded ports, synced folders and containers'
 hostnames will not be reconfigured on `vagrant reload`s if they have changed and
-the plugin **_will not give you any kind of warning or message_**. Forwarded ports
-automatic collision handling is **_not supported as well_**.
+the plugin **_will not give you any kind of warning or message_**. For instance,
+if you change your Puppet manifests / Chef cookbooks paths (which are shared /
+synced folders under the hood), **_you'll need to start from scratch_**. Oh,
+and forwarded ports automatic collision handling is **_not supported as well_**.
 
 The plugin also requires Docker's executable to be available on current user's `PATH`
 and that the current user has been added to the `docker` group since we are not

data/example/Vagrantfile

@@ -21,10 +21,15 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     end
   end
 
-  # TODO: This is a container that gets provisioned with Puppet
+  # This is a container that gets provisioned with Puppet
   config.vm.define 'precise' do |node|
     node.vm.box = 'precise'
     node.vm.box_url = 'http://bit.ly/vagrant-docker-precise'
+
+    node.vm.provision :puppet do |puppet|
+      puppet.manifests_path = "."
+      puppet.manifest_file  = "site.pp"
+    end
   end
 
   # Custom start script

data/example/site.pp

@@ -0,0 +1 @@
+package { 'htop': }

data/lib/docker-provider/action.rb

@@ -27,6 +27,7 @@ module VagrantPlugins
               # TODO: Find out where this fits into the process
               # b2.use Builtin::EnvSet, :port_collision_repair => true
               # b2.use Builtin::HandleForwardedPortCollisions
+              b2.use Builtin::Provision
               b2.use ShareFolders
               b2.use ForwardPorts
               # This will actually create and start, but that's fine
@@ -142,6 +143,7 @@ module VagrantPlugins
             # If the container is running, then our work here is done, exit
             next if env[:result]
 
+            b2.use Builtin::Provision
             b2.use Message, :starting
             b2.use action_boot
           end
@@ -150,8 +152,7 @@ module VagrantPlugins
 
       def self.action_boot
         Builder.new.tap do |b|
-          b.use Builtin::Provision
-          # b.use Builtin::SetHostname
+          # TODO: b.use Builtin::SetHostname
           b.use Start
           b.use Builtin::WaitForCommunicator
         end

data/lib/docker-provider/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DockerProvider
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-provider
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Fabio Rehm
@@ -85,6 +85,7 @@ files:
 - development/Vagrantfile
 - docker-provider.gemspec
 - example/Vagrantfile
+- example/site.pp
 - lib/docker-provider.rb
 - lib/docker-provider/action.rb
 - lib/docker-provider/action/check_running.rb