adding env_vars property and using in systemd

Signed-off-by: Sean OMeara <[email protected]>

libraries/docker_service_base.rb

@@ -16,6 +16,9 @@ class DockerServiceBase < DockerBase
     # register with the resource resolution system
     provides :docker_service_manager
 
+    # Environment variables to docker service
+    property :env_vars, Hash
+
     # daemon management
     property :instance, String, name_property: true, required: true, desired_state: false
     property :auto_restart, Boolean, default: false

libraries/docker_service_manager_systemd.rb

@@ -78,7 +78,8 @@ class DockerServiceManagerSystemd < DockerServiceBase
           docker_socket: connect_socket,
           docker_daemon_cmd: docker_daemon_cmd,
           systemd_args: systemd_args,
-          docker_wait_ready: "#{libexec_dir}/#{docker_name}-wait-ready"
+          docker_wait_ready: "#{libexec_dir}/#{docker_name}-wait-ready",
+          env_vars: new_resource.env_vars
         )
         notifies :run, 'execute[systemctl daemon-reload]', :immediately
         notifies :run, "execute[systemctl restart #{docker_name}]", :immediately

templates/default/systemd/docker.service-override.erb

@@ -23,6 +23,9 @@ Environment="NO_PROXY=<%= @config.no_proxy %>"
 <% if @config.tmpdir %>
 Environment="TMPDIR=<%= @config.tmpdir %>"
 <% end %>
+<% @env_vars.each do |key, val| %>
+Environment="<%= key %>=<%= val %>"
+<% end unless @env_vars.nil? %>
 <% if @config.ipv4_forward %>
 ExecStartPre=/sbin/sysctl -w net.ipv4.ip_forward=1
 <% end %>