vagrant-docker-compose 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cad20fa21be8f29efe766761fcb709b0cc0216ae
-  data.tar.gz: 309b813b4ac63e7922dc72b72af96b71eeeb6fab
+  metadata.gz: 5719f78a211c2e93115b316c4730e0c6ba1f0b43
+  data.tar.gz: 3b9f8ecac2ee72bdd1889bec135d3f986ca913f7
 SHA512:
-  metadata.gz: e61c9cb012ea59722303795cb2b73a7970bdbde28332924da8720a387d0983d2c41cd9b240940a941b6501a5b3367c729fa7defa6a37b7cc384c3db42e01fda1
-  data.tar.gz: e61fe2302eef57e8aef3ee0e60710008799d06366b7dd1896c1eb0f8c155b92cb4b0cb2a56bf97f265d722b013013f319f67c0dbb011a7308d546c42c07390fa
+  metadata.gz: 144f8ae1e5a6f2b4286570543aad4010a3deec3fa16a2bd9e743cc5ff4fcf41b65652f9a51bc22424e77222e61a60e46e21c72974e1af193646c606f4622d37f
+  data.tar.gz: 70b77f91b465d91247be867116edba0a7a5ba47419c3ee35f3ea2d0a4b6ec8545e5619a61d4bf57b840e376fca958661dfe9cd8a77f549be9f01bd95bd26d1bf

data/{LICENSE → LICENSE.md}

@@ -1,3 +1,5 @@
+## ISC License
+
 Copyright (c) 2015, Leigh McCulloch
 
 Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies.

data/README.md

@@ -106,6 +106,7 @@ docker-compose --x-networking -f [yml] up -d --timeout 20
 * `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.6.2`.
 * `project_name` – compose will default to naming the project `vagrant`.
+* `env` – a `Hash` of environment variables to value that are passed to the `docker-compose` commands, defaults to an empty `Hash`.
 * `executable_symlink_path` – the location the executable will be symlinked to, defaults to `/usr/local/bin/docker-compose`.
 * `executable_install_path` – the location the executable will be stored, defaults to `<executable_symlink_path>-<compose_version>`, i.e. `/usr/local/bin/docker-compose-1.5.0`.
 * `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`.

data/example/Vagrantfile

@@ -10,10 +10,12 @@ end
 Vagrant.configure("2") do |config|
   config.vm.box = "hashicorp/precise64"
 
-  config.vm.network(:forwarded_port, guest: 8080, host: 8080)
+  port = 9090
+
+  config.vm.network(:forwarded_port, guest: port, host: port)
   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-base.yml","/vagrant/docker-compose.yml"], rebuild: true, project_name: "myproject", run: "always"
+  config.vm.provision :docker_compose, env: { "PORT" => "#{port}" }, yml: ["/vagrant/docker-compose-base.yml","/vagrant/docker-compose.yml"], rebuild: true, project_name: "myproject", run: "always"
 end

data/example/docker-compose-base.yml

@@ -3,7 +3,7 @@ app:
   links:
     - redis
   ports:
-    - "8080:8080"
+    - "${PORT}:8080"
   volumes:
     - ./app/:/app/
 redis:

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

@@ -6,7 +6,7 @@ module VagrantPlugins
         up: "-d"
       }
 
-      attr_accessor :yml, :rebuild, :project_name, :executable_symlink_path, :executable_install_path, :compose_version, :options, :command_options
+      attr_accessor :yml, :rebuild, :project_name, :env, :executable_symlink_path, :executable_install_path, :compose_version, :options, :command_options
 
       def yml=(yml)
         files = yml.is_a?(Array) ? yml : [yml]
@@ -19,6 +19,7 @@ module VagrantPlugins
       def initialize
         @project_name = UNSET_VALUE
         @compose_version = UNSET_VALUE
+        @env = UNSET_VALUE
         @executable_symlink_path = UNSET_VALUE
         @executable_install_path = UNSET_VALUE
         @options = UNSET_VALUE
@@ -28,12 +29,17 @@ module VagrantPlugins
       def finalize!
         @project_name = nil if @project_name == UNSET_VALUE
         @compose_version = "1.6.2" if @compose_version == UNSET_VALUE
+        @env = {} if @env == UNSET_VALUE
         @executable_symlink_path = "/usr/local/bin/docker-compose" if @executable_symlink_path == UNSET_VALUE
         @executable_install_path = "#{@executable_symlink_path}-#{@compose_version}" if @executable_install_path == UNSET_VALUE
         @options = nil if @options == UNSET_VALUE
         @command_options = {} if @command_options == UNSET_VALUE
         @command_options = DEFAULT_COMMAND_OPTIONS.merge(@command_options)
       end
+
+      def env_s
+        @env.map { |k, v| "#{k}=#{Shellwords.escape(v)}" }.join(" ")
+      end
     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_install_path} #{@config.options} #{cli_options_for_yml_file} build #{@config.command_options[:build]}") do |type, data|
+          comm.sudo("#{@config.env_s} #{@config.executable_install_path} #{@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_install_path} #{@config.options} #{cli_options_for_yml_file} rm #{@config.command_options[:rm]}") do |type, data|
+          comm.sudo("#{@config.env_s} #{@config.executable_install_path} #{@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_install_path} #{@config.options} #{cli_options_for_yml_file} up #{@config.command_options[:up]}") do |type, data|
+          comm.sudo("#{@config.env_s} #{@config.executable_install_path} #{@config.options} #{cli_options_for_yml_file} 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 = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-docker-compose
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Leigh McCulloch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant provisioner for docker compose.
 email: 
@@ -18,7 +18,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- LICENSE
+- LICENSE.md
 - README.md
 - Rakefile
 - example/Vagrantfile
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Vagrant provisioner for docker compose.