Skip to content
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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 1 commit into from
Apr 23, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions spec/acceptance/compose_v3_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
''
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/machine_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 1 addition & 0 deletions templates/windows/check_powershell_provider.ps1.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
1 change: 1 addition & 0 deletions templates/windows/install_powershell_provider.ps1.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down