Merge pull request #270 from puppetlabs/healthcheck

fixing healthcheck WIP

Author: davejrt

lib/puppet/parser/functions/docker_run_flags.rb

@@ -46,8 +46,8 @@ module Puppet::Parser::Functions
       flags << '--detach=true'
     end
 
-    if opts['health_check_cmd']
-      flags << "--health-cmd '#{opts['health_check_command']} || exit 1'"
+    if opts['health_check_cmd'].to_s != 'undef'
+      flags << "--health-cmd #{opts['health_check_cmd']}"
     end
 
     if opts['tty']

manifests/run.pp

@@ -211,12 +211,12 @@
   }
 
   if $::osfamily == 'windows' {
-    $exec_environment = 'PATH=C:/Program Files/Docker/'
+    $exec_environment = 'PATH=C:/Program Files/Docker/;C:/Windows/System32/'
     $exec_timeout = 3000
     $exec_path = ['c:/Windows/Temp/', 'C:/Program Files/Docker/']
     $exec_provider = 'powershell'
     $cidfile = "c:/Windows/Temp/${service_prefix}${sanitised_title}.cid"
-    $restart_check = "${docker_command} inspect ${sanitised_title} -f '{{ if eq \"unhealthy\" .State.Health.Status }} {{ .Name }}{{ end }}' | findstr ${sanitised_title}"
+    $restart_check = "${docker_command} inspect ${sanitised_title} -f '{{ if eq \\\"unhealthy\\\" .State.Health.Status }} {{ .Name }}{{ end }}' | findstr ${sanitised_title}"
   } else {
     $exec_environment = 'HOME=/root'
     $exec_path = ['/bin', '/usr/bin']

spec/acceptance/docker_full_spec.rb

@@ -754,16 +754,21 @@ class { 'docker': #{docker_ee_arg} }
       it 'should restart a unhealthy container' do
       pp5=<<-EOS
         docker::run { 'container_3_7_3':
-          image   => 'base',
+          image   => '#{default_image}',
           command => '#{default_run_command}',
-          health_check_cmd => 'pwd',
+          health_check_cmd => 'echo',
           restart_on_unhealthy => true,
+          #{default_docker_run_arg}
           }
           EOS
 
-         apply_manifest(pp5, :catch_failures => true) do |r|
-           expect(r.stdout).to match(/docker-container_3_7_3-systemd-reload/)
-        end 
+        if fact('osfamily') == 'windows'
+          apply_manifest(pp5, :catch_failures => true)
+        else
+          apply_manifest(pp5, :catch_failures => true) do |r|
+            expect(r.stdout).to match(/docker-container_3_7_3-systemd-reload/)
+          end
+        end
       end
     end