Added environment variables support

Author: etki

metadata.rb

@@ -6,7 +6,7 @@
 license          'MIT'
 description      'Installs/Configures ama-docker-compose'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '0.1.1'
+version          '0.1.2'
 
 supports 'debian', '>= 7.0'
 supports 'ubuntu', '>= 14.04'

resources/docker_compose_deployment.rb

@@ -9,6 +9,7 @@
 attribute :shell_timeout, Integer, default: 300
 attribute :signal, String, default: 'SIGKILL'
 attribute :scale, String
+attribute :environment, [Hash, NilClass], default: {}
 
 action_class do
   def configuration_files
@@ -23,9 +24,12 @@ def execute(*arguments)
     end
     command = command.concat(arguments)
     parameters = {}
-    if @new_resource.shell_timeout and new_resource.shell_timeout > 0
+    if new_resource.shell_timeout and new_resource.shell_timeout > 0
       parameters[:timeout] = new_resource.shell_timeout
     end
+    if new_resource.environment
+      parameters[:environment] = new_resource.environment
+    end
     execution = Mixlib::ShellOut.new(*command, parameters).run_command
     execution.error!
   end

test/cookbooks/ama-docker-compose-integration/recipes/default.rb

@@ -36,3 +36,4 @@
 include_recipe '::deployment_up_and_kill'
 include_recipe '::deployment_lifecycle'
 include_recipe '::deployment_up_and_down_with_different_executable'
+include_recipe '::deployment_environment'

test/cookbooks/ama-docker-compose-integration/recipes/deployment_environment.rb

@@ -0,0 +1,41 @@
+#
+# Cookbook Name:: ama-docker-compose-integration
+# Recipe:: deployment_environment
+#
+# Copyright 2017, AMA Team
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+workspace = workspace_directory!('environment')
+path = ::File.join(workspace, 'docker-compose-custom.yml')
+custom_path = ::File.join(workspace, 'docker-compose-custom.yml')
+
+cookbook_file custom_path do
+  source 'docker-compose.yml'
+end
+
+# It should bring up deployment even though compose file path is not
+# supplied directly
+docker_compose_deployment 'fake://path' do
+  files([])
+  environment(COMPOSE_FILE: custom_path)
+  action [:up, :kill]
+end

test/integration/default/controls/installation.rb

@@ -24,7 +24,6 @@
   end
 end
 
-
 control 'existing installation removal' do
   describe docker_compose_installation(profile.workspace('existing-installation-removal/docker-compose')) do
     it { should_not exist }