vagrant-docker-compose 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3930486d1aca6411df319ba44bf95db974ee92a0
-  data.tar.gz: 5fc231c462804a9c894eac310df38a58efccbfe6
+  metadata.gz: cc49169ca96df9dafab14dc0bfebccee5a6f8d5e
+  data.tar.gz: 403a29721cdc20c3e3a317a1f37e222af87e102b
 SHA512:
-  metadata.gz: faa873b961027a58f5eefa22064d4ea4c35145b0be46a4dcd3f3dd12ee75606dc2dea6b13efd16aeb2d29f1e1fe8a1f69ef9ac02eadb7fdd4c99fdf2a32932ae
-  data.tar.gz: f20c1bbef3c16f41aebe8417ce72774cc3b75b354731b18a175662b1a6aa6827887a57655ee4f16c01567d2c301e2a8a9713efe2b44cbf98cfc9fd27087f21e9
+  metadata.gz: 741a3bdf7937076377412532d06137d88fcd17e7f8210984212d38de2549c07c3233e9a82e25f1261b58040ba7720d6e46f915f460ea37880e4ed390d9b63521
+  data.tar.gz: c7b17dcb7dc4f8077011c3f65ec71c77acdbb581b991d359da11f52bcd30334c6c0e04404e2337f042985e25a1eee97baf2a93d7c0f861c1f7b0893d25e2d415

data/Gemfile

@@ -3,6 +3,7 @@ gemspec
 
 group :development do
   gem "vagrant", git: "https://github.com/mitchellh/vagrant.git", tag: "v1.7.4"
+  gem "rake"
 end
 
 group :plugins do

data/README.md

@@ -38,6 +38,29 @@ Equivalent to running:
 docker-compose -f [yml] up -d
 ```
 
+### To install and run docker-compose, with multiple files, 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-base.yml",
+      "/vagrant/docker-compose.yml",
+      ...
+    ],
+    run: "always"
+end
+```
+
+Equivalent to running:
+
+```bash
+docker-compose -f [yml-0] -f [yml-1] ... up -d
+```
+
 ### To install, rebuild and run docker-compose on `vagrant up`
 
 ```ruby
@@ -80,6 +103,7 @@ docker-compose --x-networking -f [yml] up -d --timeout 20
 
 ### Other configs
 
+* `yml` – one or more [Compose files](https://docs.docker.com/compose/compose-file/) (YAML), may be a `String` for a single file, or `Array` for multiple.
 * `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`.

data/example/Vagrantfile

@@ -11,8 +11,9 @@ Vagrant.configure("2") do |config|
   config.vm.box = "hashicorp/precise64"
 
   config.vm.network(:forwarded_port, guest: 8080, host: 8080)
+  config.vm.network(:forwarded_port, guest: 3333, host: 3333)
 
   config.vm.provision :shell, inline: "apt-get update"
   config.vm.provision :docker
-  config.vm.provision :docker_compose, yml: "/vagrant/docker-compose.yml", rebuild: true, project_name: "myproject", run: "always"
+  config.vm.provision :docker_compose, yml: ["/vagrant/docker-compose-base.yml","/vagrant/docker-compose.yml"], rebuild: true, project_name: "myproject", run: "always"
 end

data/example/docker-compose-base.yml

@@ -0,0 +1,10 @@
+app:
+  build: ./app
+  links:
+    - redis
+  ports:
+    - "8080:8080"
+  volumes:
+    - ./app/:/app/
+redis:
+  image: redis

data/example/docker-compose.yml

@@ -1,10 +1,3 @@
 app:
-  build: ./app
-  links:
-    - redis
   ports:
-    - "8080:8080"
-  volumes:
-    - ./app/:/app/
-redis:
-  image: redis
+    - "3333:8080"

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

@@ -9,7 +9,10 @@ module VagrantPlugins
       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?
+        files = yml.is_a?(Array) ? yml : [yml]
+        files.each do |file|
+          raise DockerComposeError, :yml_must_be_absolute if !Pathname.new(file).absolute?
+        end
         @yml = yml
       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} #{@config.options} -f \"#{@config.yml}\" build #{@config.command_options[:build]}") do |type, data|
+          comm.sudo("#{@config.executable} #{@config.options} #{cli_options_for_yml_file} 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} #{@config.options} -f \"#{@config.yml}\" rm #{@config.command_options[:rm]}") do |type, data|
+          comm.sudo("#{@config.executable} #{@config.options} #{cli_options_for_yml_file} 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} #{@config.options} -f \"#{@config.yml}\" up #{@config.command_options[:up]}") do |type, data|
+          comm.sudo("#{@config.executable} #{@config.options} #{cli_options_for_yml_file} up #{@config.command_options[:up]}") do |type, data|
             handle_comm(type, data)
           end
         end
@@ -45,6 +45,13 @@ module VagrantPlugins
         when :stderr; @machine.ui.error(data)
         end
       end
+
+      private
+
+      def cli_options_for_yml_file
+        files = @config.yml.is_a?(Array) ? @config.yml : [@config.yml]
+        files.map { |file| "-f \"#{file}\"" }.join(" ")
+      end
     end
   end
 end

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-docker-compose
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Leigh McCulloch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-01 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant provisioner for docker compose.
 email: 
@@ -25,6 +25,7 @@ files:
 - example/app/Dockerfile
 - example/app/index.html
 - example/app/init.sh
+- example/docker-compose-base.yml
 - example/docker-compose.yml
 - lib/vagrant-docker-compose.rb
 - lib/vagrant-docker-compose/cap/linux/docker_compose_install.rb