]> gitweb.fluxo.info Git - trashman.git/commitdiff
Fix: docker: distro pubkey (2)
authorSilvio Rhatto <rhatto@riseup.net>
Mon, 5 Apr 2021 13:45:42 +0000 (10:45 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Mon, 5 Apr 2021 13:45:42 +0000 (10:45 -0300)
share/trashman/docker/unix/linux/debian/install

index fb45711a290b474a3cfeb76a30e8a46a2594f86c..728a270b24c1affcf4a88ade0831f9e2696317cb 100755 (executable)
@@ -18,10 +18,11 @@ RELEASE="`trashman_distro_release`"
 apt-get update && trashman_apt_install apt-transport-https
 
 # Install pubkey
-trashman_install_apt_key $SHARE/docker/unix/linux/$DISTRO/pubkey.gpg docker.gpg
+#trashman_install_apt_key $SHARE/docker/unix/linux/$DISTRO/pubkey.gpg docker.gpg
+curl -fsSL https://download.docker.com/linux/$DISTRO/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
 
 # Create sources.list entry
-echo "deb [arch=$ARCH] https://download.docker.com/linux/$DISTRO $RELEASE stable" > /etc/apt/sources.list.d/docker.list
+echo "deb [arch=$ARCH signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/$DISTRO $RELEASE stable" > /etc/apt/sources.list.d/docker.list
 
 # Update and install
 apt-get update && trashman_apt_install docker-ce docker-compose || exit 1