File tree 3 files changed +16
-1
lines changed
3 files changed +16
-1
lines changed Original file line number Diff line number Diff line change 30
30
'docker_msft_provider_version' => '123' ,
31
31
'nuget_package_provider_version' => '41' ,
32
32
} ,
33
+ 'with keyring set to optional path' => {
34
+ 'keyring' => '/root/keyrings/docker.gpg' ,
35
+ } ,
33
36
}
34
37
35
38
describe 'docker' , type : :class do
180
183
'tmp_dir' => defaults [ 'tmp_dir' ] ,
181
184
'use_upstream_package_source' => defaults [ 'use_upstream_package_source' ] ,
182
185
'version' => defaults [ 'version' ] ,
186
+ 'keyring' => defaults [ 'keyring' ]
183
187
} . merge ( default_params ) . merge ( local_params )
184
188
185
189
let ( :facts ) do
Original file line number Diff line number Diff line change @@ -88,6 +88,7 @@ def get_defaults(_facts)
88
88
tmp_dir = '/tmp/'
89
89
tmp_dir_config = true
90
90
version = :undef
91
+ keyring = '/etc/apt/keyrings/docker.gpg'
91
92
92
93
if _facts [ :os ] [ 'family' ] == 'windows'
93
94
compose_install_path = "#{ _facts [ 'docker_program_files_path' ] } /Docker"
@@ -487,5 +488,6 @@ def get_defaults(_facts)
487
488
'tmp_dir_config' => tmp_dir_config ,
488
489
'use_upstream_package_source' => use_upstream_package_source ,
489
490
'version' => version ,
491
+ 'keyring' => keyring ,
490
492
}
491
493
end
Original file line number Diff line number Diff line change 11
11
key_source = values [ 'package_key_source' ]
12
12
key_check_source = values [ 'package_key_check_source' ]
13
13
architecture = facts [ :os ] [ 'architecture' ]
14
+ keyring = params [ 'keyring' ]
14
15
15
16
unless params [ 'prerequired_packages' ] . empty?
16
17
params [ 'prerequired_packages' ] . each do |package |
29
30
if params [ 'use_upstream_package_source' ]
30
31
# check if debian version is atleast 10 and ubuntu version is atleast 22
31
32
if ( facts [ :operatingsystem ] == 'Debian' and facts [ :operatingsystemrelease ] =~ /1[0-9]/ ) or ( facts [ :operatingsystem ] == 'Ubuntu' and facts [ :operatingsystemrelease ] =~ /2[2-9]/ )
33
+ it {
34
+ is_expected . to contain_file ( keyring ) . with (
35
+ 'ensure' => 'file' ,
36
+ 'mode' => '0644' ,
37
+ 'owner' => 'root' ,
38
+ 'group' => 'root' ,
39
+ )
40
+ }
32
41
it {
33
42
is_expected . to contain_apt__source ( 'docker' ) . with (
34
43
'location' => location ,
35
44
'architecture' => architecture ,
36
45
'release' => release ,
37
46
'repos' => package_repos ,
38
- 'keyring' => '/etc/apt/keyrings/docker.gpg' ,
47
+ 'keyring' => keyring ,
39
48
'include' => {
40
49
'src' => false ,
41
50
} ,
You can’t perform that action at this time.
0 commit comments