Skip to content

Commit 6acc559

Browse files
authored
Merge pull request #264 from puppetlabs/CLOUD-1969
fixes fact for windows
2 parents 690bd52 + 5f7217a commit 6acc559

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

lib/facter/docker.rb

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
require 'facter'
22
require 'json'
33

4+
docker_command = if Facter.value(:kernel) == 'windows'
5+
'powershell -c docker'
6+
else
7+
'docker'
8+
end
9+
410
def interfaces
511
Facter.value(:interfaces).split(',')
612
end
@@ -23,7 +29,7 @@ def interfaces
2329
setcode do
2430
if Facter::Util::Resolution.which('docker')
2531
value = Facter::Core::Execution.execute(
26-
"docker version --format '{{json .}}'",
32+
"#{docker_command} version --format '{{json .}}'",
2733
)
2834
val = JSON.parse(value)
2935
end
@@ -37,7 +43,7 @@ def interfaces
3743
if docker_version !~ %r{1[.][0-9][0-2]?[.]\w+}
3844
if Facter::Util::Resolution.which('docker')
3945
docker_json_str = Facter::Util::Resolution.exec(
40-
"docker info --format '{{json .}}'",
46+
"#{docker_command} info --format '{{json .}}'",
4147
)
4248
docker = JSON.parse(docker_json_str)
4349
docker['network'] = {}

0 commit comments

Comments
 (0)