Skip to content

Commit 66ac0e2

Browse files
admontscotty-c
authored andcommitted
Bugfix/docker apt repo gpg key fix (#58)
* dockerproject.org is using another gpg key than download.docker.com * Cover fix by unit test
1 parent 058de80 commit 66ac0e2

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

manifests/repos.pp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
repos => 'main',
2525
release => 'ubuntu-xenial',
2626
key => {
27-
'id' => '9DC858229FC7DD38854AE2D88D81803C0EBFCD88',
28-
'source' => 'https://download.docker.com/linux/ubuntu/gpg',
27+
'id' => '58118E89F3A912897C070ADBF76221572C52609D',
28+
'source' => 'https://apt.dockerproject.org/gpg',
2929
},
3030
}
3131
}

spec/classes/repos_spec.rb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,13 @@
1717
let(:params) { { 'container_runtime' => 'docker' } }
1818

1919
it { should contain_apt__source('kubernetes') }
20-
it { should contain_apt__source('docker') }
20+
it { should contain_apt__source('docker').with(
21+
:ensure => 'present',
22+
:location => 'https://apt.dockerproject.org/repo',
23+
:repos => 'main',
24+
:release => 'ubuntu-xenial',
25+
:key => { 'id' => '58118E89F3A912897C070ADBF76221572C52609D', 'source' => 'https://apt.dockerproject.org/gpg' }
26+
) }
2127

2228
end
2329

0 commit comments

Comments
 (0)