Skip to content

Fix windows default paths #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 5, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions lib/facter/docker.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,34 @@
require 'facter'
require 'json'

Facter.add(:docker_systemroot) do
confine :osfamily => :windows
setcode do
Puppet::Util.get_env('SystemRoot')
end
end

Facter.add(:docker_program_files_path) do
confine :osfamily => :windows
setcode do
Puppet::Util.get_env('ProgramFiles')
end
end

Facter.add(:docker_program_data_path) do
confine :osfamily => :windows
setcode do
Puppet::Util.get_env('ProgramData')
end
end

Facter.add(:docker_user_temp_path) do
confine :osfamily => :windows
setcode do
Puppet::Util.get_env('TEMP')
end
end

docker_command = if Facter.value(:kernel) == 'windows'
'powershell -c docker'
else
Expand Down
42 changes: 16 additions & 26 deletions manifests/compose.pp
Original file line number Diff line number Diff line change
Expand Up @@ -56,26 +56,16 @@
$docker_download_command = "if (Invoke-WebRequest ${docker_compose_url} ${proxy_opt} -UseBasicParsing -OutFile \"${docker_compose_location_versioned}\") { exit 0 } else { exit 1}"
# lint:endignore

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

$script_path = 'C:/Windows/Temp/download_docker_compose.ps1'
file{ $script_path:
ensure => present,
force => true,
content => template('docker/windows/download_docker_compose.ps1.erb'),
notify => Exec["Install Docker Compose ${version}"],
}

exec { "Install Docker Compose ${version}":
path => ['c:/Windows/Temp/', 'C:/Program Files/Docker/'],
command => "& ${script_path}",
provider => powershell,
creates => $docker_compose_location_versioned,
file { $docker_compose_location:

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: Can't say I'm a fan of symlinks as it's not Windows-y but I guess it will do.

ensure => 'link',
target => $docker_compose_location_versioned,
require => Exec["Install Docker Compose ${version}"]
}
} else {
ensure_packages(['curl'])
Expand All @@ -86,18 +76,18 @@
creates => $docker_compose_location_versioned,
require => Package['curl'],
}
}

file { $docker_compose_location_versioned:
owner => $file_owner,
mode => '0755',
require => Exec["Install Docker Compose ${version}"]
}
file { $docker_compose_location_versioned:
owner => $file_owner,
mode => '0755',
require => Exec["Install Docker Compose ${version}"]
}

file { $docker_compose_location:
ensure => 'link',
target => $docker_compose_location_versioned,
require => File[$docker_compose_location_versioned]
file { $docker_compose_location:
ensure => 'link',
target => $docker_compose_location_versioned,
require => File[$docker_compose_location_versioned]
}
}
} else {
file { [
Expand Down
4 changes: 2 additions & 2 deletions manifests/exec.pp
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
$docker_command = $docker::params::docker_command

if $::osfamily == 'windows' {
$exec_environment = 'PATH=C:/Program Files/Docker/'
$exec_environment = "PATH=${::docker_program_files_path}/Docker/"
$exec_timeout = 3000
$exec_path = ['c:/Windows/Temp/', 'C:/Program Files/Docker/']
$exec_path = ["${::docker_program_files_path}/Docker/"]
$exec_provider = 'powershell'
} else {
$exec_environment = 'HOME=/root'
Expand Down
10 changes: 5 additions & 5 deletions manifests/image.pp
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@

if $::osfamily == 'windows' {
$update_docker_image_template = 'docker/windows/update_docker_image.ps1.erb'
$update_docker_image_path = 'C:/Windows/Temp/update_docker_image.ps1'
$exec_environment = 'PATH=C:/Program Files/Docker/'
$update_docker_image_path = "${::docker_user_temp_path}/update_docker_image.ps1"
$exec_environment = "PATH=${::docker_program_files_path}/Docker/"
$exec_timeout = 3000
$update_docker_image_owner = undef
$exec_path = ['c:/Windows/Temp/', 'C:/Program Files/Docker/']
$exec_path = ["${::docker_program_files_path}/Docker/"]
$exec_provider = 'powershell'
} else {
$update_docker_image_template = 'docker/update_docker_image.sh.erb'
Expand Down Expand Up @@ -117,15 +117,15 @@
$image_install = "${docker_command} build -t ${image_arg} ${docker_dir}"
} elsif $docker_file {
if $::osfamily == windows {
$image_install = "Get-Content ${docker_file} | ${docker_command} build -t ${image_arg} -"
$image_install = "Get-Content ${docker_file} -Raw | ${docker_command} build -t ${image_arg} -"
} else {
$image_install = "${docker_command} build -t ${image_arg} - < ${docker_file}"
}
} elsif $docker_tar {
$image_install = "${docker_command} load -i ${docker_tar}"
} else {
if $::osfamily == 'windows' {
$image_install = "& ${update_docker_image_path} ${image_arg}"
$image_install = "& ${update_docker_image_path} -DockerImage ${image_arg}"
} else {
$image_install = "${update_docker_image_path} ${image_arg}"
}
Expand Down
16 changes: 10 additions & 6 deletions manifests/params.pp
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@
$tls_enable = false
$tls_verify = true
if ($::osfamily == 'windows') {
$tls_cacert = 'C:/ProgramData/docker/certs.d/ca.pem'
$tls_cert = 'C:/ProgramData/docker/certs.d/server-cert.pem'
$tls_key = 'C:/ProgramData/docker/certs.d/server-key.pem'
$tls_cacert = "${::docker_program_data_path}/docker/certs.d/ca.pem"
$tls_cert = "${::docker_program_data_path}/docker/certs.d/server-cert.pem"
$tls_key = "${::docker_program_data_path}/docker/certs.d/server-key.pem"
$compose_version = '1.21.2'
$compose_install_path = 'C:/Program Files/Docker'
$compose_install_path = "${::docker_program_files_path}/Docker"
} else {
$tls_cacert = '/etc/docker/tls/ca.pem'
$tls_cert = '/etc/docker/tls/cert.pem'
Expand Down Expand Up @@ -85,7 +85,11 @@
$overlay2_override_kernel_check = false
$manage_package = true
$package_source = undef
$docker_command = 'docker'
if ($::osfamily == 'windows') {
$docker_command = 'docker'
} else {
$docker_command = 'docker'
}
$service_name_default = 'docker'
$docker_group_default = 'docker'
$storage_devs = undef
Expand Down Expand Up @@ -222,7 +226,7 @@
$msft_provider_version = $docker_msft_provider_version
$msft_package_version = $version
$service_config_template = 'docker/windows/config/daemon.json.erb'
$service_config = 'C:/ProgramData/docker/config/daemon.json'
$service_config = "${::docker_program_data_path}/docker/config/daemon.json"
$docker_group = 'docker'
$package_ce_source_location = undef
$package_ce_key_source = undef
Expand Down
4 changes: 4 additions & 0 deletions manifests/plugin.pp
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@

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

if ($::osfamily == 'windows') {
fail(translate(('Feature not implemented on windows.')))
}

if $ensure == 'present' {
$docker_plugin_install_flags = docker_plugin_install_flags({
plugin_name => $plugin_name,
Expand Down
6 changes: 3 additions & 3 deletions manifests/registry.pp
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
$docker_command = $docker::params::docker_command

if $::osfamily == 'windows' {
$exec_environment = ['PATH=C:/Program Files/Docker/']
$exec_environment = ["PATH=${::docker_program_files_path}/Docker/"]
$exec_timeout = 3000
$exec_path = ['c:/Windows/Temp/', 'C:/Program Files/Docker/']
$exec_path = ["${::docker_program_files_path}/Docker/"]
$exec_provider = 'powershell'
$password_env = '$env:password'
$exec_user = undef
Expand Down Expand Up @@ -113,7 +113,7 @@
} else {
# server may be an URI, which can contain /
$server_strip = regsubst($server, '[/:]', '_', 'G')
$passfile = "C:/Windows/Temp/registry-auth-puppet_receipt_${server_strip}_${local_user}"
$passfile = "${::docker_user_temp_path}/registry-auth-puppet_receipt_${server_strip}_${local_user}"
# lint:ignore:140chars
$_auth_command = "if (-not (${auth_cmd})) { Remove-Item -Path ${passfile} -Force -Recurse -EA SilentlyContinue; exit 0 } else { exit 0 }"
# lint:endignore
Expand Down
6 changes: 3 additions & 3 deletions manifests/run.pp
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,11 @@
}

if $::osfamily == 'windows' {
$exec_environment = 'PATH=C:/Program Files/Docker/;C:/Windows/System32/'
$exec_environment = "PATH=${::docker_program_files_path}/Docker/;${::docker_systemroot}/System32/"
$exec_timeout = 3000
$exec_path = ['c:/Windows/Temp/', 'C:/Program Files/Docker/']
$exec_path = ["${::docker_program_files_path}/Docker/"]
$exec_provider = 'powershell'
$cidfile = "c:/Windows/Temp/${service_prefix}${sanitised_title}.cid"
$cidfile = "${::docker_user_temp_path}/${service_prefix}${sanitised_title}.cid"
# lint:ignore:140chars
$restart_check = "${docker_command} inspect ${sanitised_title} -f '{{ if eq \\\"unhealthy\\\" .State.Health.Status }} {{ .Name }}{{ end }}' | findstr ${sanitised_title}"
# lint:endignore
Expand Down
2 changes: 1 addition & 1 deletion manifests/service.pp
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@
}
}
if $::osfamily == 'windows' {
file { ['C:/ProgramData/docker/', 'C:/ProgramData/docker/config/']:
file { ["${::docker_program_data_path}/docker/", "${::docker_program_data_path}/docker/config/"]:
ensure => directory,
}
}
Expand Down
3 changes: 1 addition & 2 deletions manifests/services.pp
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,8 @@
}

if $::osfamily == 'windows' {
$exec_environment = 'PATH=C:/Program Files/Docker/'
$exec_timeout = 3000
$exec_path = ['c:/Windows/Temp/', 'C:/Program Files/Docker/']
$exec_path = ["${::docker_program_files_path}/Docker/"]
$exec_provider = 'powershell'
} else {
$exec_environment = 'HOME=/root'
Expand Down
4 changes: 2 additions & 2 deletions manifests/swarm.pp
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@
include docker::params

if $::osfamily == 'windows' {
$exec_environment = 'PATH=C:/Program Files/Docker/'
$exec_path = ['c:/Windows/Temp/', 'C:/Program Files/Docker/']
$exec_environment = "PATH=${::docker_program_files_path}/Docker/"
$exec_path = ["${::docker_program_files_path}/Docker/"]
$exec_timeout = 3000
$exec_provider = 'powershell'
$unless_init = '$info = docker info | select-string -pattern "Swarm: active"
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/docker_custom_source_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ class { 'docker': #{docker_args} }

shell("#{docker_command} inspect container-3-6", :acceptable_exit_codes => [1])
if fact('osfamily') == 'windows'
shell('test -f /cygdrive/c/Windows/Temp/container-3-6.service', :acceptable_exit_codes => [1])
shell('test -f /cygdrive/c/Users/Administrator/AppData/Local/Temp/container-3-6.service', :acceptable_exit_codes => [1])
else
shell('test -f /etc/systemd/system/container-3-6.service', :acceptable_exit_codes => [1])
end
Expand Down
24 changes: 17 additions & 7 deletions spec/acceptance/docker_full_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
default_image_tag = '10.0.14393.2189'
second_image = 'hello-world'
default_digest = 'sha256:204c41542c0927ac0296802e44c56b886b47e99cf8220fb49d46951bd5fc1742'
default_dockerfile = 'c:/windows/temp/Dockerfile'
default_dockerfile = 'C:/Users/Administrator/AppData/Local/Temp/Dockerfile'
dockerfile_test = 'C:/Windows/Dockerfile_test.txt'
#The default args are set because:
#restart => 'always' - there is no service created to manage containers
#net => 'nat' - docker uses bridged by default when running a container. When installing docker on windows the default network is NAT.
Expand All @@ -15,7 +16,7 @@
docker_command = "\"/cygdrive/c/Program Files/Docker/docker\""
default_docker_exec_lr_command = 'cmd /c "ping 127.0.0.1 -t > c:\windows\temp\test_file.txt"'
default_docker_exec_command = 'cmd /c "echo test > c:\windows\temp\test_file.txt"'
docker_mount_path = "c:/windows/temp"
docker_mount_path = 'C:/Users/Administrator/AppData/Local/Temp'
storage_driver = "windowsfilter"
elsif fact('osfamily') == 'RedHat'
docker_args = "repo_opt => '--enablerepo=localmirror-extras'"
Expand All @@ -24,6 +25,7 @@
default_image_tag = '3.7'
default_digest = 'sha256:3dcdb92d7432d56604d4545cbd324b14e647b313626d99b889d0626de158f73a'
default_dockerfile = '/root/Dockerfile'
dockerfile_test = "#{default_dockerfile}_test.txt"
docker_command = "docker"
default_docker_run_arg = ''
default_run_command = "init"
Expand All @@ -38,6 +40,7 @@
default_image_tag = '3.7'
default_digest = 'sha256:3dcdb92d7432d56604d4545cbd324b14e647b313626d99b889d0626de158f73a'
default_dockerfile = '/root/Dockerfile'
dockerfile_test = "#{default_dockerfile}_test.txt"
docker_command = "docker"
default_docker_run_arg = ''
default_run_command = "init"
Expand Down Expand Up @@ -145,7 +148,7 @@ class { 'docker': #{docker_args} }

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

it 'should create a new image based on a Dockerfile' do

if fact('osfamily') == 'windows'
run_cmd = 'RUN echo test > C:\\Windows\\Temp\\Dockerfile_test.txt'
else
run_cmd = "RUN echo test > #{dockerfile_test}"
end

pp=<<-EOS
class { 'docker': #{docker_args} }
Expand All @@ -327,7 +337,7 @@ class { 'docker': #{docker_args} }
file { '#{default_dockerfile}':
ensure => present,
content => "FROM #{default_image}\nRUN echo test > #{default_dockerfile}_test.txt",
content => "FROM #{default_image}\n#{run_cmd}",
before => Docker::Image['alpine_with_file'],
}
EOS
Expand All @@ -342,8 +352,8 @@ class { 'docker': #{docker_args} }
expect(r.stdout).to match(/_test.txt/)
end
else
shell("#{docker_command} run alpine_with_file ls #{default_dockerfile}_test.txt") do |r|
expect(r.stdout).to match(/#{default_dockerfile}_test.txt/)
shell("#{docker_command} run alpine_with_file ls #{dockerfile_test}") do |r|
expect(r.stdout).to match(/#{dockerfile_test}/)
end
end
end
Expand Down Expand Up @@ -567,7 +577,7 @@ class { 'docker': #{docker_args} }
sleep 4
container_id = shell("#{docker_command} ps | awk 'FNR == 2 {print $1}'")
if fact('osfamily') == 'windows'
shell("#{docker_command} exec #{container_id.stdout.strip} cmd /c dir Windows\\\\Temp\\\\mnt") do |r|
shell("#{docker_command} exec #{container_id.stdout.strip} cmd /c dir Users\\\\Administrator\\\\AppData\\\\Local\\\\Temp\\\\mnt") do |r|
expect(r.stdout).to match(/test_mount.txt/)
end
else
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/docker_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
docker_network = 'nat'
registry_host = @windows_ip
config_file = '/cygdrive/c/Users/Administrator/.docker/config.json'
root_dir = "C:/Windows/Temp"
root_dir = "C:/Users/Administrator/AppData/Local/Temp"
server_strip = "#{registry_host}_#{registry_port}"
bad_server_strip = "#{registry_host}_5001"
broken = true
Expand Down
Loading