mirror of
https://github.com/docker/docker-install.git
synced 2026-11-20 10:03:11 +03:00
From docker/docker - install dirmngr if needed
as of Ubuntu Yakkety, dirmngr is now in a separate package (see https://bugs.launchpad.net/ubuntu/+source/apt/+bug/1634464) this patch updates the install script to install the dirmngr package if it's not installed. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
1 parent
4d66d3f320
commit
fc65b226b8
1 file changed
+7
-1
+7
-1
@@ -462,11 +462,17 @@ do_install() {
|
||||
( set -x; $sh_c 'sleep 3; apt-get install -y -q curl ca-certificates' )
|
||||
curl='curl -sSL'
|
||||
fi
|
||||
if [ ! -e /usr/bin/gpg ]; then
|
||||
if ! command -v gpg > /dev/null; then
|
||||
apt_get_update
|
||||
( set -x; $sh_c 'sleep 3; apt-get install -y -q gnupg2 || apt-get install -y -q gnupg' )
|
||||
fi
|
||||
|
||||
# dirmngr is a separate package in ubuntu yakkety; see https://bugs.launchpad.net/ubuntu/+source/apt/+bug/1634464
|
||||
if ! command -v dirmngr > /dev/null; then
|
||||
apt_get_update
|
||||
( set -x; $sh_c 'sleep 3; apt-get install -y -q dirmngr' )
|
||||
fi
|
||||
|
||||
(
|
||||
set -x
|
||||
echo "$docker_key" | apt-key add -
|
||||
|
||||
Reference in new issue
Block a user