Skip to content

Commit 79b08b6

Browse files
authored
Merge pull request #268 from puppetlabs/1.2.0
1.2.0
2 parents 6acc559 + bf1057c commit 79b08b6

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

manifests/run.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@
216216
$exec_path = ['c:/Windows/Temp/', 'C:/Program Files/Docker/']
217217
$exec_provider = 'powershell'
218218
$cidfile = "c:/Windows/Temp/${service_prefix}${sanitised_title}.cid"
219+
$restart_check = "${docker_command} inspect ${sanitised_title} -f '{{ if eq \"unhealthy\" .State.Health.Status }} {{ .Name }}{{ end }}' | findstr ${sanitised_title}"
219220
} else {
220221
$exec_environment = 'HOME=/root'
221222
$exec_path = ['/bin', '/usr/bin']

spec/acceptance/docker_full_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -859,4 +859,4 @@ class { 'docker': #{docker_ee_arg} }
859859
end
860860
end
861861
end
862-
end
862+
end

0 commit comments

Comments
 (0)