From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 5 Apr 2021 13:45:42 +0000 (-0300)
Subject: Fix: docker: distro pubkey (2)
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=c02b560cc4a5f91cdf3f244955d12b60cb0ab94b;p=trashman.git

Fix: docker: distro pubkey (2)
---

diff --git a/share/trashman/docker/unix/linux/debian/install b/share/trashman/docker/unix/linux/debian/install
index fb45711..728a270 100755
--- a/share/trashman/docker/unix/linux/debian/install
+++ b/share/trashman/docker/unix/linux/debian/install
@@ -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