Fix: use the recommended APT keyrings folder

diff --git a/manifests/ce.pp b/manifests/ce.pp
index 25a2204a81efd96ac9caf8794be4fe98c7ab5ad1..99b6935bd974dde0b11023f1e99ca34224a4f8a6 100644 (file)
--- a/manifests/ce.pp
+++ b/manifests/ce.pp
@@ -2,7 +2,16 @@
 class docker::ce inherits docker {
   $distro = downcase($::lsbdistid)
 
+  # Old location
   file { '/etc/apt/trusted.gpg.d/docker.gpg':
+    ensure => absent,
+    mode   => '0644',
+    owner  => 'root',
+    group  => 'root',
+    source => "puppet:///modules/docker/${distro}.gpg",
+  }
+
+  file { '/etc/apt/keyrings/docker.gpg':
     ensure => present,
     mode   => '0644',
     owner  => 'root',
@@ -15,8 +24,8 @@ class docker::ce inherits docker {
     owner   => "root",
     group   => "root",
     mode    => "0644",
-    content => "deb [arch=${::architecture}] https://download.docker.com/linux/${distro} ${::lsbdistcodename} stable\n",
-    require => File['/etc/apt/trusted.gpg.d/docker.gpg'],
+    content => "deb [signed-by=/etc/apt/keyrings/docker.gpg arch=${::architecture}] https://download.docker.com/linux/${distro} ${::lsbdistcodename} stable\n",
+    require => File['/etc/apt/keyrings/docker.gpg'],
     notify  => Exec['docker-apt-auto-update'],
   }