Skip to content

Commit 7246980

Browse files
kenyonkenyon
committed
Use modern APT keyrings on Debian family
This makes use of puppetlabs/puppetlabs-apt#1128 to store the public key in `/etc/apt/keyrings` and add a `signed-by` option to the `sources.list.d` entry.
1 parent 757dc37 commit 7246980

File tree

4 files changed

+2
-28
lines changed

4 files changed

+2
-28
lines changed

‎manifests/init.pp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -312,12 +312,10 @@
312312
# @param docker_ce_cli_package_name
313313
# @param docker_ce_source_location
314314
# @param docker_ce_key_source
315-
# @param docker_ce_key_id
316315
# @param docker_ce_release
317316
# @param docker_package_location
318317
# @param docker_package_key_source
319318
# @param docker_package_key_check_source
320-
# @param docker_package_key_id
321319
# @param docker_package_release
322320
# @param docker_engine_start_command
323321
# @param docker_engine_package_name
@@ -326,7 +324,6 @@
326324
# @param docker_ee_package_name
327325
# @param docker_ee_source_location
328326
# @param docker_ee_key_source
329-
# @param docker_ee_key_id
330327
# @param docker_ee_repos
331328
# @param docker_ee_release
332329
# @param package_release
@@ -359,12 +356,10 @@
359356
String[1] $docker_ce_cli_package_name = $docker::params::docker_ce_cli_package_name,
360357
Optional[String] $docker_ce_source_location = $docker::params::package_ce_source_location,
361358
Optional[String] $docker_ce_key_source = $docker::params::package_ce_key_source,
362-
Optional[String] $docker_ce_key_id = $docker::params::package_ce_key_id,
363359
Optional[String] $docker_ce_release = $docker::params::package_ce_release,
364360
Optional[String] $docker_package_location = $docker::params::package_source_location,
365361
Optional[String] $docker_package_key_source = $docker::params::package_key_source,
366362
Optional[Boolean] $docker_package_key_check_source = $docker::params::package_key_check_source,
367-
Optional[String] $docker_package_key_id = $docker::params::package_key_id,
368363
Optional[String] $docker_package_release = $docker::params::package_release,
369364
String $docker_engine_start_command = $docker::params::docker_engine_start_command,
370365
String $docker_engine_package_name = $docker::params::docker_engine_package_name,
@@ -373,7 +368,6 @@
373368
Optional[String] $docker_ee_package_name = $docker::params::package_ee_package_name,
374369
Optional[String] $docker_ee_source_location = $docker::params::package_ee_source_location,
375370
Optional[String] $docker_ee_key_source = $docker::params::package_ee_key_source,
376-
Optional[String] $docker_ee_key_id = $docker::params::package_ee_key_id,
377371
Optional[String] $docker_ee_repos = $docker::params::package_ee_repos,
378372
Optional[String] $docker_ee_release = $docker::params::package_ee_release,
379373
Optional[Variant[String,Array[String]]] $tcp_bind = $docker::params::tcp_bind,
@@ -548,7 +542,6 @@
548542
$package_location = $docker::docker_ee_source_location
549543
$package_key_source = $docker::docker_ee_key_source
550544
$package_key_check_source = $docker_package_key_check_source
551-
$package_key = $docker::docker_ee_key_id
552545
$package_repos = $docker::docker_ee_repos
553546
$release = $docker::docker_ee_release
554547
$docker_start_command = $docker::docker_ee_start_command
@@ -558,7 +551,6 @@
558551
'Debian' : {
559552
$package_location = $docker_ce_source_location
560553
$package_key_source = $docker_ce_key_source
561-
$package_key = $docker_ce_key_id
562554
$package_repos = $docker_ce_channel
563555
$release = $docker_ce_release
564556
}
@@ -586,7 +578,6 @@
586578
$package_location = $docker_package_location
587579
$package_key_source = $docker_package_key_source
588580
$package_key_check_source = $docker_package_key_check_source
589-
$package_key = $docker_package_key_id
590581
$package_repos = 'main'
591582
$release = $docker_package_release
592583
}

‎manifests/params.pp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
$docker_ee_start_command = 'dockerd'
1414
$docker_ee_source_location = undef
1515
$docker_ee_key_source = undef
16-
$docker_ee_key_id = undef
1716
$docker_ee_repos = stable
1817
$tcp_bind = undef
1918
$tls_enable = false
@@ -168,7 +167,6 @@
168167

169168
$package_ce_source_location = "https://download.docker.com/linux/${os_lc}"
170169
$package_ce_key_source = "https://download.docker.com/linux/${os_lc}/gpg"
171-
$package_ce_key_id = '9DC858229FC7DD38854AE2D88D81803C0EBFCD88'
172170
if (versioncmp($facts['facterversion'], '2.4.6') <= 0) {
173171
$package_ce_release = $facts['os']['lsb']['distcodename']
174172
} else {
@@ -177,10 +175,8 @@
177175
$package_source_location = 'http://apt.dockerproject.org/repo'
178176
$package_key_source = 'https://apt.dockerproject.org/gpg'
179177
$package_key_check_source = undef
180-
$package_key_id = '58118E89F3A912897C070ADBF76221572C52609D'
181178
$package_ee_source_location = $docker_ee_source_location
182179
$package_ee_key_source = $docker_ee_key_source
183-
$package_ee_key_id = $docker_ee_key_id
184180
if (versioncmp($facts['facterversion'], '2.4.6') <= 0) {
185181
$package_ee_release = $facts['os']['lsb']['distcodename']
186182
} else {
@@ -211,18 +207,15 @@
211207

212208
$apt_source_pin_level = undef
213209
$detach_service_in_init = false
214-
$package_ce_key_id = undef
215210
$package_ce_key_source = 'https://download.docker.com/linux/centos/gpg'
216211
$package_ce_release = undef
217212
$package_ce_source_location = "https://download.docker.com/linux/centos/${facts['os']['release']['major']}/${facts['os']['architecture']}/${docker_ce_channel}"
218-
$package_ee_key_id = $docker_ee_key_id
219213
$package_ee_key_source = $docker_ee_key_source
220214
$package_ee_package_name = $docker_ee_package_name
221215
$package_ee_release = undef
222216
$package_ee_repos = $docker_ee_repos
223217
$package_ee_source_location = $docker_ee_source_location
224218
$package_key_check_source = true
225-
$package_key_id = undef
226219
$package_key_source = 'https://yum.dockerproject.org/gpg'
227220
$package_release = undef
228221
$package_source_location = "https://yum.dockerproject.org/repo/main/centos/${facts['os']['release']['major']}"
@@ -247,18 +240,15 @@
247240
$docker_group = 'docker'
248241
$package_ce_source_location = undef
249242
$package_ce_key_source = undef
250-
$package_ce_key_id = undef
251243
$package_ce_repos = undef
252244
$package_ce_release = undef
253-
$package_key_id = undef
254245
$package_release = undef
255246
$package_source_location = undef
256247
$package_key_source = undef
257248
$package_key_check_source = undef
258249
$package_ee_source_location = undef
259250
$package_ee_package_name = $docker_ee_package_name
260251
$package_ee_key_source = undef
261-
$package_ee_key_id = undef
262252
$package_ee_repos = undef
263253
$package_ee_release = undef
264254
$use_upstream_package_source = undef
@@ -284,17 +274,14 @@
284274
$package_key_source = undef
285275
$package_key_check_source = undef
286276
$package_source_location = undef
287-
$package_key_id = undef
288277
$package_repos = undef
289278
$package_release = undef
290279
$package_ce_key_source = undef
291280
$package_ce_source_location = undef
292-
$package_ce_key_id = undef
293281
$package_ce_repos = undef
294282
$package_ce_release = undef
295283
$package_ee_source_location = undef
296284
$package_ee_key_source = undef
297-
$package_ee_key_id = undef
298285
$package_ee_release = undef
299286
$package_ee_repos = undef
300287
$package_ee_package_name = undef
@@ -324,17 +311,14 @@
324311
$package_key_source = undef
325312
$package_key_check_source = undef
326313
$package_source_location = undef
327-
$package_key_id = undef
328314
$package_repos = undef
329315
$package_release = undef
330316
$package_ce_key_source = undef
331317
$package_ce_source_location = undef
332-
$package_ce_key_id = undef
333318
$package_ce_repos = undef
334319
$package_ce_release = undef
335320
$package_ee_source_location = undef
336321
$package_ee_key_source = undef
337-
$package_ee_key_id = undef
338322
$package_ee_release = undef
339323
$package_ee_repos = undef
340324
$package_ee_package_name = undef

‎manifests/repos.pp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
case $facts['os']['family'] {
2020
'Debian': {
2121
$release = $docker::release
22-
$package_key = $docker::package_key
2322
$package_repos = $docker::package_repos
2423

2524
if ($docker::use_upstream_package_source) {
@@ -29,7 +28,7 @@
2928
release => $release,
3029
repos => $package_repos,
3130
key => {
32-
id => $package_key,
31+
name => 'docker.asc',
3332
source => $key_source,
3433
},
3534
include => {

‎metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
},
1515
{
1616
"name": "puppetlabs/apt",
17-
"version_requirement": ">= 4.4.1 < 10.0.0"
17+
"version_requirement": ">= 9.2.0 < 10.0.0"
1818
},
1919
{
2020
"name": "puppetlabs/powershell",

0 commit comments

Comments
 (0)