-
Notifications
You must be signed in to change notification settings - Fork 311
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Replace 'docker-compose' with the docker-compose-plugin
These changes include updates to the docker compose related code and tests. Install compose as plugin on linux Simplify compose install clean class compose_spec.rb Fix linting issue Since all usage of dockercompose is now replaced by docker, this line can be removed Fix syntax and indentation Use the package resource directly
- Loading branch information
1 parent
8f4b3d9
commit ece0e8d
Showing
5 changed files
with
54 additions
and
247 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -9,29 +9,6 @@ | |
}, | ||
'with version => 1.7.0' => { | ||
'version' => '1.7.0' | ||
}, | ||
'when proxy is provided' => { | ||
'version' => '1.7.0', | ||
'proxy' => 'http://proxy.example.org:3128/' | ||
}, | ||
'when proxy is not a http proxy' => { | ||
'proxy' => 'this is not a URL' | ||
}, | ||
'when proxy contains username and password' => { | ||
'version' => '1.7.0', | ||
'proxy' => 'http://user:[email protected]:3128/' | ||
}, | ||
'when proxy IP is provided' => { | ||
'version' => '1.7.0', | ||
'proxy' => 'http://10.10.10.10:3128/' | ||
}, | ||
'when base_url is provided' => { | ||
'version' => '1.7.0', | ||
'base_url' => 'http://example.org' | ||
}, | ||
'when raw_url is provided' => { | ||
'version' => '1.7.0', | ||
'raw_url' => 'http://example.org' | ||
} | ||
} | ||
|
||
|
@@ -56,13 +33,7 @@ | |
context title do | ||
params = { | ||
'ensure' => 'present', | ||
'version' => defaults['compose_version'], | ||
'install_path' => defaults['compose_install_path'], | ||
'symlink_name' => defaults['compose_symlink_name'], | ||
'proxy' => :undef, | ||
'base_url' => defaults['compose_base_url'], | ||
'raw_url' => :undef, | ||
'curl_ensure' => defaults['curl_ensure'] | ||
'version' => defaults['compose_version'] | ||
}.merge(local_params) | ||
|
||
let(:facts) do | ||
|
@@ -73,15 +44,7 @@ | |
params | ||
end | ||
|
||
if title == 'when proxy is not a http proxy' | ||
it 'raises an error for invalid proxy URL' do | ||
expect(subject).to compile.and_raise_error( | ||
%r{parameter 'proxy' expects an undef value or a match for Pattern}, | ||
) | ||
end | ||
else | ||
include_examples 'compose', params, facts | ||
end | ||
include_examples 'compose', params, facts | ||
end | ||
end | ||
end | ||
|
Oops, something went wrong.