vagrant-docker-compose 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec0c779c611426816ec4cf201f08bc9dbd623d76
-  data.tar.gz: 8294a0fd3a95b6797c1a2a6f726e5a4d5bc76538
+  metadata.gz: 3930486d1aca6411df319ba44bf95db974ee92a0
+  data.tar.gz: 5fc231c462804a9c894eac310df38a58efccbfe6
 SHA512:
-  metadata.gz: 7be92c16845f98d12be8b311c2c68f81c60030fa640a802aeca05fd418b9aeaecf0e01d640ee9815a8984fa3591d390df08d942645d14b64d432b77ea0b4f999
-  data.tar.gz: 796485b45d0973e7a2952e369decf74cc515427423b7a321ec1c3a309b993e81b7b7108479d69331c6824301964a75f3ef7f40a7b115fa53ebea4d55d3929e67
+  metadata.gz: faa873b961027a58f5eefa22064d4ea4c35145b0be46a4dcd3f3dd12ee75606dc2dea6b13efd16aeb2d29f1e1fe8a1f69ef9ac02eadb7fdd4c99fdf2a32932ae
+  data.tar.gz: f20c1bbef3c16f41aebe8417ce72774cc3b75b354731b18a175662b1a6aa6827887a57655ee4f16c01567d2c301e2a8a9713efe2b44cbf98cfc9fd27087f21e9

data/README.md

@@ -35,7 +35,7 @@ end
 Equivalent to running:
 
 ```bash
-docker-compose -f [yml] up
+docker-compose -f [yml] up -d
 ```
 
 ### To install, rebuild and run docker-compose on `vagrant up`
@@ -52,16 +52,39 @@ end
 Equivalent to running:
 
 ```bash
-docker-compose -f [yml] rm
+docker-compose -f [yml] rm --force
 docker-compose -f [yml] build
-docker-compose -f [yml] up
+docker-compose -f [yml] up -d
 ```
 
+### To install, rebuild and run docker-compose with options on `vagrant up`
+
+```ruby
+Vagrant.configure("2") do |config|
+  config.vm.box = "ubuntu/trusty64"
+
+  config.vm.provision :docker
+  config.vm.provision :docker_compose, yml: "/vagrant/docker-compose.yml", rebuild: true,
+    options: "--x-networking", command_options: { rm: "", up: "-d --timeout 20"}, run: "always"
+end
+```
+
+Equivalent to running:
+
+```bash
+docker-compose --x-networking -f [yml] rm
+docker-compose --x-networking -f [yml] build
+docker-compose --x-networking -f [yml] up -d --timeout 20
+```
+
+
 ### Other configs
 
 * `compose_version` – defaults to `1.5.0`.
 * `project_name` – compose will default to naming the project `vagrant`.
 * `executable` – the location the executable will be stored, defaults to `/usr/local/bin/docker-compose`.
+* `options` - a `String` that's included as the first arguments when calling the docker-compose executable, you can use this to pass arbitrary options/flags to docker-compose, default to `nil`.
+* `command_options` - a `Hash` of docker-compose commands to options, you can use this to pass arbitrary options/flags to the docker-compose commands, defaults to: `{ rm: "--force", up: "-d" }`.
 
 ## Example
 

data/example/Vagrantfile

@@ -8,7 +8,7 @@ unless Vagrant.has_plugin?("vagrant-docker-compose")
 end
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "hashicorp/precise64"
 
   config.vm.network(:forwarded_port, guest: 8080, host: 8080)
 

data/lib/vagrant-docker-compose/config.rb

@@ -1,7 +1,12 @@
 module VagrantPlugins
   module DockerComposeProvisioner
     class Config < Vagrant.plugin("2", :config)
-      attr_accessor :yml, :rebuild, :project_name, :executable, :compose_version
+      DEFAULT_COMMAND_OPTIONS = {
+        rm: "--force",
+        up: "-d"
+      }
+
+      attr_accessor :yml, :rebuild, :project_name, :executable, :compose_version, :options, :command_options
 
       def yml=(yml)
         raise DockerComposeError, :yml_must_be_absolute if !Pathname.new(yml).absolute?
@@ -12,12 +17,17 @@ module VagrantPlugins
         @executable = UNSET_VALUE
         @project_name = UNSET_VALUE
         @compose_version = UNSET_VALUE
+        @options = UNSET_VALUE
+        @command_options = UNSET_VALUE
       end
 
       def finalize!
         @executable = "/usr/local/bin/docker-compose" if @executable == UNSET_VALUE
         @project_name = nil if @project_name == UNSET_VALUE
         @compose_version = "1.5.0" if @compose_version == UNSET_VALUE
+        @options = nil if @options == UNSET_VALUE
+        @command_options = {} if @command_options == UNSET_VALUE
+        @command_options = DEFAULT_COMMAND_OPTIONS.merge(@command_options)
       end
     end
   end

data/lib/vagrant-docker-compose/docker_compose.rb

@@ -11,7 +11,7 @@ module VagrantPlugins
       def build
         @machine.ui.detail(I18n.t(:docker_compose_build))
         @machine.communicate.tap do |comm|
-          comm.sudo("#{@config.executable} -f \"#{@config.yml}\" build") do |type, data|
+          comm.sudo("#{@config.executable} #{@config.options} -f \"#{@config.yml}\" build #{@config.command_options[:build]}") do |type, data|
             handle_comm(type, data)
           end
         end
@@ -20,7 +20,7 @@ module VagrantPlugins
       def rm
         @machine.ui.detail(I18n.t(:docker_compose_rm))
         @machine.communicate.tap do |comm|
-          comm.sudo("#{@config.executable} -f \"#{@config.yml}\" rm --force") do |type, data|
+          comm.sudo("#{@config.executable} #{@config.options} -f \"#{@config.yml}\" rm #{@config.command_options[:rm]}") do |type, data|
             handle_comm(type, data)
           end
         end
@@ -29,7 +29,7 @@ module VagrantPlugins
       def up
         @machine.ui.detail(I18n.t(:docker_compose_up))
         @machine.communicate.tap do |comm|
-          comm.sudo("#{@config.executable} -f \"#{@config.yml}\" up -d") do |type, data|
+          comm.sudo("#{@config.executable} #{@config.options} -f \"#{@config.yml}\" up #{@config.command_options[:up]}") do |type, data|
             handle_comm(type, data)
           end
         end

data/lib/vagrant-docker-compose/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DockerComposeProvisioner
-    VERSION = "0.0.7"
+    VERSION = "0.0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-docker-compose
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Leigh McCulloch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant provisioner for docker compose.
 email: