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>
Upstream-commit: f5263c8074c091555592787e32319a6a4f39e650
Component: engine
This commit is contained in:
Sebastiaan van Stijn
2017-02-01 12:17:23 -08:00
parent 7558a71652
commit 44e0a761dd
+7 -1
View File
@@ -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 -