Skip to content

Commit 49d485b

Browse files
florindragosflorindragos
committed
Fix windows default paths
1 parent e7b0795 commit 49d485b

24 files changed

+191
-145
lines changed

Diff for: ‎lib/facter/docker.rb

+28
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,34 @@
11
require 'facter'
22
require 'json'
33

4+
Facter.add(:docker_systemroot) do
5+
confine :osfamily => :windows
6+
setcode do
7+
ENV['SystemRoot']
8+
end
9+
end
10+
11+
Facter.add(:docker_program_files_path) do
12+
confine :osfamily => :windows
13+
setcode do
14+
ENV['ProgramFiles']
15+
end
16+
end
17+
18+
Facter.add(:docker_program_data_path) do
19+
confine :osfamily => :windows
20+
setcode do
21+
ENV['ProgramData']
22+
end
23+
end
24+
25+
Facter.add(:docker_user_temp_path) do
26+
confine :osfamily => :windows
27+
setcode do
28+
ENV['TEMP']
29+
end
30+
end
31+
432
docker_command = if Facter.value(:kernel) == 'windows'
533
'powershell -c docker'
634
else

Diff for: ‎manifests/compose.pp

+16-26
Original file line numberDiff line numberDiff line change
@@ -56,26 +56,16 @@
5656
$docker_download_command = "if (Invoke-WebRequest ${docker_compose_url} ${proxy_opt} -UseBasicParsing -OutFile \"${docker_compose_location_versioned}\") { exit 0 } else { exit 1}"
5757
# lint:endignore
5858

59-
exec { 'Enable TLS 1.2 in powershell':
60-
path => ['c:/Windows/Temp/', 'C:/Program Files/Docker/'],
61-
command => '[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12',
59+
exec { "Install Docker Compose ${version}":
60+
command => template('docker/windows/download_docker_compose.ps1.erb'),
6261
provider => powershell,
6362
creates => $docker_compose_location_versioned,
6463
}
6564

66-
$script_path = 'C:/Windows/Temp/download_docker_compose.ps1'
67-
file{ $script_path:
68-
ensure => present,
69-
force => true,
70-
content => template('docker/windows/download_docker_compose.ps1.erb'),
71-
notify => Exec["Install Docker Compose ${version}"],
72-
}
73-
74-
exec { "Install Docker Compose ${version}":
75-
path => ['c:/Windows/Temp/', 'C:/Program Files/Docker/'],
76-
command => "& ${script_path}",
77-
provider => powershell,
78-
creates => $docker_compose_location_versioned,
65+
file { $docker_compose_location:
66+
ensure => 'link',
67+
target => $docker_compose_location_versioned,
68+
require => Exec["Install Docker Compose ${version}"]
7969
}
8070
} else {
8171
ensure_packages(['curl'])
@@ -86,18 +76,18 @@
8676
creates => $docker_compose_location_versioned,
8777
require => Package['curl'],
8878
}
89-
}
9079

91-
file { $docker_compose_location_versioned:
92-
owner => $file_owner,
93-
mode => '0755',
94-
require => Exec["Install Docker Compose ${version}"]
95-
}
80+
file { $docker_compose_location_versioned:
81+
owner => $file_owner,
82+
mode => '0755',
83+
require => Exec["Install Docker Compose ${version}"]
84+
}
9685

97-
file { $docker_compose_location:
98-
ensure => 'link',
99-
target => $docker_compose_location_versioned,
100-
require => File[$docker_compose_location_versioned]
86+
file { $docker_compose_location:
87+
ensure => 'link',
88+
target => $docker_compose_location_versioned,
89+
require => File[$docker_compose_location_versioned]
90+
}
10191
}
10292
} else {
10393
file { [

Diff for: ‎manifests/exec.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
$docker_command = $docker::params::docker_command
2020

2121
if $::osfamily == 'windows' {
22-
$exec_environment = 'PATH=C:/Program Files/Docker/'
22+
$exec_environment = "PATH=${::docker_program_files_path}/Docker/"
2323
$exec_timeout = 3000
24-
$exec_path = ['c:/Windows/Temp/', 'C:/Program Files/Docker/']
24+
$exec_path = ["${::docker_program_files_path}/Docker/"]
2525
$exec_provider = 'powershell'
2626
} else {
2727
$exec_environment = 'HOME=/root'

Diff for: ‎manifests/image.pp

+5-5
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838

3939
if $::osfamily == 'windows' {
4040
$update_docker_image_template = 'docker/windows/update_docker_image.ps1.erb'
41-
$update_docker_image_path = 'C:/Windows/Temp/update_docker_image.ps1'
42-
$exec_environment = 'PATH=C:/Program Files/Docker/'
41+
$update_docker_image_path = "${::docker_user_temp_path}/update_docker_image.ps1"
42+
$exec_environment = "PATH=${::docker_program_files_path}/Docker/"
4343
$exec_timeout = 3000
4444
$update_docker_image_owner = undef
45-
$exec_path = ['c:/Windows/Temp/', 'C:/Program Files/Docker/']
45+
$exec_path = ["${::docker_program_files_path}/Docker/"]
4646
$exec_provider = 'powershell'
4747
} else {
4848
$update_docker_image_template = 'docker/update_docker_image.sh.erb'
@@ -117,15 +117,15 @@
117117
$image_install = "${docker_command} build -t ${image_arg} ${docker_dir}"
118118
} elsif $docker_file {
119119
if $::osfamily == windows {
120-
$image_install = "Get-Content ${docker_file} | ${docker_command} build -t ${image_arg} -"
120+
$image_install = "Get-Content ${docker_file} -Raw | ${docker_command} build -t ${image_arg} -"
121121
} else {
122122
$image_install = "${docker_command} build -t ${image_arg} - < ${docker_file}"
123123
}
124124
} elsif $docker_tar {
125125
$image_install = "${docker_command} load -i ${docker_tar}"
126126
} else {
127127
if $::osfamily == 'windows' {
128-
$image_install = "& ${update_docker_image_path} ${image_arg}"
128+
$image_install = "& ${update_docker_image_path} -DockerImage ${image_arg}"
129129
} else {
130130
$image_install = "${update_docker_image_path} ${image_arg}"
131131
}

Diff for: ‎manifests/params.pp

+10-6
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
$tls_enable = false
2626
$tls_verify = true
2727
if ($::osfamily == 'windows') {
28-
$tls_cacert = 'C:/ProgramData/docker/certs.d/ca.pem'
29-
$tls_cert = 'C:/ProgramData/docker/certs.d/server-cert.pem'
30-
$tls_key = 'C:/ProgramData/docker/certs.d/server-key.pem'
28+
$tls_cacert = "${::docker_program_data_path}/docker/certs.d/ca.pem"
29+
$tls_cert = "${::docker_program_data_path}/docker/certs.d/server-cert.pem"
30+
$tls_key = "${::docker_program_data_path}/docker/certs.d/server-key.pem"
3131
$compose_version = '1.21.2'
32-
$compose_install_path = 'C:/Program Files/Docker'
32+
$compose_install_path = "${::docker_program_files_path}/Docker"
3333
} else {
3434
$tls_cacert = '/etc/docker/tls/ca.pem'
3535
$tls_cert = '/etc/docker/tls/cert.pem'
@@ -85,7 +85,11 @@
8585
$overlay2_override_kernel_check = false
8686
$manage_package = true
8787
$package_source = undef
88-
$docker_command = 'docker'
88+
if ($::osfamily == 'windows') {
89+
$docker_command = 'docker'
90+
} else {
91+
$docker_command = 'docker'
92+
}
8993
$service_name_default = 'docker'
9094
$docker_group_default = 'docker'
9195
$storage_devs = undef
@@ -222,7 +226,7 @@
222226
$msft_provider_version = $docker_msft_provider_version
223227
$msft_package_version = $version
224228
$service_config_template = 'docker/windows/config/daemon.json.erb'
225-
$service_config = 'C:/ProgramData/docker/config/daemon.json'
229+
$service_config = "${::docker_program_data_path}/docker/config/daemon.json"
226230
$docker_group = 'docker'
227231
$package_ce_source_location = undef
228232
$package_ce_key_source = undef

Diff for: ‎manifests/plugin.pp

+4
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@
6464

6565
$docker_command = "${docker::params::docker_command} plugin"
6666

67+
if ($::osfamily == 'windows') {
68+
fail(translate(('Feature not implemented on windows.')))
69+
}
70+
6771
if $ensure == 'present' {
6872
$docker_plugin_install_flags = docker_plugin_install_flags({
6973
plugin_name => $plugin_name,

Diff for: ‎manifests/registry.pp

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
$docker_command = $docker::params::docker_command
4949

5050
if $::osfamily == 'windows' {
51-
$exec_environment = ['PATH=C:/Program Files/Docker/']
51+
$exec_environment = ["PATH=${::docker_program_files_path}/Docker/"]
5252
$exec_timeout = 3000
53-
$exec_path = ['c:/Windows/Temp/', 'C:/Program Files/Docker/']
53+
$exec_path = ["${::docker_program_files_path}/Docker/"]
5454
$exec_provider = 'powershell'
5555
$password_env = '$env:password'
5656
$exec_user = undef
@@ -113,7 +113,7 @@
113113
} else {
114114
# server may be an URI, which can contain /
115115
$server_strip = regsubst($server, '[/:]', '_', 'G')
116-
$passfile = "C:/Windows/Temp/registry-auth-puppet_receipt_${server_strip}_${local_user}"
116+
$passfile = "${::docker_user_temp_path}/registry-auth-puppet_receipt_${server_strip}_${local_user}"
117117
# lint:ignore:140chars
118118
$_auth_command = "if (-not (${auth_cmd})) { Remove-Item -Path ${passfile} -Force -Recurse -EA SilentlyContinue; exit 0 } else { exit 0 }"
119119
# lint:endignore

Diff for: ‎manifests/run.pp

+3-3
Original file line numberDiff line numberDiff line change
@@ -223,11 +223,11 @@
223223
}
224224

225225
if $::osfamily == 'windows' {
226-
$exec_environment = 'PATH=C:/Program Files/Docker/;C:/Windows/System32/'
226+
$exec_environment = "PATH=${::docker_program_files_path}/Docker/;${::docker_systemroot}/System32/"
227227
$exec_timeout = 3000
228-
$exec_path = ['c:/Windows/Temp/', 'C:/Program Files/Docker/']
228+
$exec_path = ["${::docker_program_files_path}/Docker/"]
229229
$exec_provider = 'powershell'
230-
$cidfile = "c:/Windows/Temp/${service_prefix}${sanitised_title}.cid"
230+
$cidfile = "${::docker_user_temp_path}/${service_prefix}${sanitised_title}.cid"
231231
# lint:ignore:140chars
232232
$restart_check = "${docker_command} inspect ${sanitised_title} -f '{{ if eq \\\"unhealthy\\\" .State.Health.Status }} {{ .Name }}{{ end }}' | findstr ${sanitised_title}"
233233
# lint:endignore

Diff for: ‎manifests/service.pp

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
}
153153
}
154154
if $::osfamily == 'windows' {
155-
file { ['C:/ProgramData/docker/', 'C:/ProgramData/docker/config/']:
155+
file { ["${::docker_program_data_path}/docker/", "${::docker_program_data_path}/docker/config/"]:
156156
ensure => directory,
157157
}
158158
}

Diff for: ‎manifests/services.pp

+1-2
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,8 @@
106106
}
107107

108108
if $::osfamily == 'windows' {
109-
$exec_environment = 'PATH=C:/Program Files/Docker/'
110109
$exec_timeout = 3000
111-
$exec_path = ['c:/Windows/Temp/', 'C:/Program Files/Docker/']
110+
$exec_path = ["${::docker_program_files_path}/Docker/"]
112111
$exec_provider = 'powershell'
113112
} else {
114113
$exec_environment = 'HOME=/root'

Diff for: ‎manifests/swarm.pp

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@
9191
include docker::params
9292

9393
if $::osfamily == 'windows' {
94-
$exec_environment = 'PATH=C:/Program Files/Docker/'
95-
$exec_path = ['c:/Windows/Temp/', 'C:/Program Files/Docker/']
94+
$exec_environment = "PATH=${::docker_program_files_path}/Docker/"
95+
$exec_path = ["${::docker_program_files_path}/Docker/"]
9696
$exec_timeout = 3000
9797
$exec_provider = 'powershell'
9898
$unless_init = '$info = docker info | select-string -pattern "Swarm: active"

Diff for: ‎spec/acceptance/docker_custom_source_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ class { 'docker': #{docker_args} }
9393

9494
shell("#{docker_command} inspect container-3-6", :acceptable_exit_codes => [1])
9595
if fact('osfamily') == 'windows'
96-
shell('test -f /cygdrive/c/Windows/Temp/container-3-6.service', :acceptable_exit_codes => [1])
96+
shell('test -f /cygdrive/c/Users/Administrator/AppData/Local/Temp/container-3-6.service', :acceptable_exit_codes => [1])
9797
else
9898
shell('test -f /etc/systemd/system/container-3-6.service', :acceptable_exit_codes => [1])
9999
end

Diff for: ‎spec/acceptance/docker_full_spec.rb

+17-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
default_image_tag = '10.0.14393.2189'
77
second_image = 'hello-world'
88
default_digest = 'sha256:204c41542c0927ac0296802e44c56b886b47e99cf8220fb49d46951bd5fc1742'
9-
default_dockerfile = 'c:/windows/temp/Dockerfile'
9+
default_dockerfile = 'C:/Users/Administrator/AppData/Local/Temp/Dockerfile'
10+
dockerfile_test = 'C:/Windows/Dockerfile_test.txt'
1011
#The default args are set because:
1112
#restart => 'always' - there is no service created to manage containers
1213
#net => 'nat' - docker uses bridged by default when running a container. When installing docker on windows the default network is NAT.
@@ -15,7 +16,7 @@
1516
docker_command = "\"/cygdrive/c/Program Files/Docker/docker\""
1617
default_docker_exec_lr_command = 'cmd /c "ping 127.0.0.1 -t > c:\windows\temp\test_file.txt"'
1718
default_docker_exec_command = 'cmd /c "echo test > c:\windows\temp\test_file.txt"'
18-
docker_mount_path = "c:/windows/temp"
19+
docker_mount_path = 'C:/Users/Administrator/AppData/Local/Temp'
1920
storage_driver = "windowsfilter"
2021
elsif fact('osfamily') == 'RedHat'
2122
docker_args = "repo_opt => '--enablerepo=localmirror-extras'"
@@ -24,6 +25,7 @@
2425
default_image_tag = '3.7'
2526
default_digest = 'sha256:3dcdb92d7432d56604d4545cbd324b14e647b313626d99b889d0626de158f73a'
2627
default_dockerfile = '/root/Dockerfile'
28+
dockerfile_test = "#{default_dockerfile}_test.txt"
2729
docker_command = "docker"
2830
default_docker_run_arg = ''
2931
default_run_command = "init"
@@ -38,6 +40,7 @@
3840
default_image_tag = '3.7'
3941
default_digest = 'sha256:3dcdb92d7432d56604d4545cbd324b14e647b313626d99b889d0626de158f73a'
4042
default_dockerfile = '/root/Dockerfile'
43+
dockerfile_test = "#{default_dockerfile}_test.txt"
4144
docker_command = "docker"
4245
default_docker_run_arg = ''
4346
default_run_command = "init"
@@ -145,7 +148,7 @@ class { 'docker': #{docker_args} }
145148

146149
shell("#{docker_command} inspect container-3-6", :acceptable_exit_codes => [1])
147150
if fact('osfamily') == 'windows'
148-
shell('test -f /cygdrive/c/Windows/Temp/container-3-6.service', :acceptable_exit_codes => [1])
151+
shell('test -f /cygdrive/c/Users/Administrator/AppData/Local/Temp/container-3-6.service', :acceptable_exit_codes => [1])
149152
else
150153
shell('test -f /etc/systemd/system/container-3-6.service', :acceptable_exit_codes => [1])
151154
end
@@ -317,6 +320,13 @@ class { 'docker': #{docker_args} }
317320
end
318321

319322
it 'should create a new image based on a Dockerfile' do
323+
324+
if fact('osfamily') == 'windows'
325+
run_cmd = 'RUN echo test > C:\\Windows\\Temp\\Dockerfile_test.txt'
326+
else
327+
run_cmd = "RUN echo test > #{dockerfile_test}"
328+
end
329+
320330
pp=<<-EOS
321331
class { 'docker': #{docker_args} }
322332
@@ -327,7 +337,7 @@ class { 'docker': #{docker_args} }
327337
328338
file { '#{default_dockerfile}':
329339
ensure => present,
330-
content => "FROM #{default_image}\nRUN echo test > #{default_dockerfile}_test.txt",
340+
content => "FROM #{default_image}\n#{run_cmd}",
331341
before => Docker::Image['alpine_with_file'],
332342
}
333343
EOS
@@ -342,8 +352,8 @@ class { 'docker': #{docker_args} }
342352
expect(r.stdout).to match(/_test.txt/)
343353
end
344354
else
345-
shell("#{docker_command} run alpine_with_file ls #{default_dockerfile}_test.txt") do |r|
346-
expect(r.stdout).to match(/#{default_dockerfile}_test.txt/)
355+
shell("#{docker_command} run alpine_with_file ls #{dockerfile_test}") do |r|
356+
expect(r.stdout).to match(/#{dockerfile_test}/)
347357
end
348358
end
349359
end
@@ -567,7 +577,7 @@ class { 'docker': #{docker_args} }
567577
sleep 4
568578
container_id = shell("#{docker_command} ps | awk 'FNR == 2 {print $1}'")
569579
if fact('osfamily') == 'windows'
570-
shell("#{docker_command} exec #{container_id.stdout.strip} cmd /c dir Windows\\\\Temp\\\\mnt") do |r|
580+
shell("#{docker_command} exec #{container_id.stdout.strip} cmd /c dir Users\\\\Administrator\\\\AppData\\\\Local\\\\Temp\\\\mnt") do |r|
571581
expect(r.stdout).to match(/test_mount.txt/)
572582
end
573583
else

Diff for: ‎spec/acceptance/docker_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
docker_network = 'nat'
1313
registry_host = @windows_ip
1414
config_file = '/cygdrive/c/Users/Administrator/.docker/config.json'
15-
root_dir = "C:/Windows/Temp"
15+
root_dir = "C:/Users/Administrator/AppData/Local/Temp"
1616
server_strip = "#{registry_host}_#{registry_port}"
1717
bad_server_strip = "#{registry_host}_5001"
1818
broken = true

0 commit comments

Comments
 (0)