mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #30616 from thaJeztah/fix-yakkety-install
install dirmngr if needed
This commit is contained in:
commit
632c8dd4cf
1 changed files with 7 additions and 1 deletions
|
@ -462,11 +462,17 @@ do_install() {
|
||||||
( set -x; $sh_c 'sleep 3; apt-get install -y -q curl ca-certificates' )
|
( set -x; $sh_c 'sleep 3; apt-get install -y -q curl ca-certificates' )
|
||||||
curl='curl -sSL'
|
curl='curl -sSL'
|
||||||
fi
|
fi
|
||||||
if [ ! -e /usr/bin/gpg ]; then
|
if ! command -v gpg > /dev/null; then
|
||||||
apt_get_update
|
apt_get_update
|
||||||
( set -x; $sh_c 'sleep 3; apt-get install -y -q gnupg2 || apt-get install -y -q gnupg' )
|
( set -x; $sh_c 'sleep 3; apt-get install -y -q gnupg2 || apt-get install -y -q gnupg' )
|
||||||
fi
|
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
|
set -x
|
||||||
echo "$docker_key" | apt-key add -
|
echo "$docker_key" | apt-key add -
|
||||||
|
|
Loading…
Reference in a new issue