Merge pull request #603 from carabasdaniel/fix_acceptance

Enforce TLS1.2 on Windows; minor fixes for RH-based testing

Author: DavidS

spec/acceptance/compose_v3_spec.rb

@@ -11,11 +11,9 @@
                      'nanoserver-sac2016'
                    end
 else
-  docker_args = if os[:name] == 'RedHat'
+  docker_args = if os[:family] == 'redhat'
                   "repo_opt => '--enablerepo=localmirror-extras'"
-                elsif os[:name] == 'Centos'
-                  "repo_opt => '--enablerepo=localmirror-extras'"
-                elsif os[:name] == 'Ubuntu' && os[:release][:full] == '14.04'
+                elsif os[:name] == 'ubuntu' && os[:release][:full] == '14.04'
                   "version => '18.06.1~ce~3-0~ubuntu'"
                 else
                   ''

spec/acceptance/machine_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper_acceptance'
 
-describe 'docker::machine' do
+describe 'docker::machine', win_broken: true do
   context 'with default parameters' do
     pp = <<-EOS
       include docker::machine

templates/windows/check_powershell_provider.ps1.erb

@@ -1,4 +1,5 @@
 # this file checks the status of the Windows Docker package using the DockerMsftProvider powershell provider
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 $dockerProviderName="DockerMsftProvider"
 
 Write-Information "Checking Package Provider"

templates/windows/install_powershell_provider.ps1.erb

@@ -1,4 +1,5 @@
 # this file install the Windows Docker package using the DockerMsftProvider powershell provider
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
 $dockerProviderName="DockerMsftProvider"
 
 Write-Information "Installing Package Provider"