build-unit-test-docker: Use curl for getting keys
apt-key fails to get keys when behind a firewall. Use curl to
get keys via http proxy and add them using apt-key add.
Tested: docker build and run using "scripts/build-unit-test-docker".
Change-Id: I3fa3e4cdd326681b72a77ac251de76a9359ce706
Signed-off-by: Jagpal Singh Gill <paligill@gmail.com>
diff --git a/scripts/build-unit-test-docker b/scripts/build-unit-test-docker
index 68534a5..537731f 100755
--- a/scripts/build-unit-test-docker
+++ b/scripts/build-unit-test-docker
@@ -727,12 +727,15 @@
# We need the keys to be imported for dbgsym repos
# New releases have a package, older ones fall back to manual fetching
# https://wiki.ubuntu.com/Debug%20Symbol%20Packages
+# Known issue with gpg to get keys via proxy -
+# https://bugs.launchpad.net/ubuntu/+source/gnupg2/+bug/1788190, hence using
+# curl to get keys.
RUN apt-get update && apt-get dist-upgrade -yy && \
( apt-get install gpgv ubuntu-dbgsym-keyring || \
- ( apt-get install -yy dirmngr && \
- apt-key adv --keyserver keyserver.ubuntu.com \
- {proxy_keyserver} \
- --recv-keys F2EDC64DC5AEE1F6B9C621F0C8CAB6595FDFF622 ) )
+ ( apt-get install -yy dirmngr curl && \
+ curl -sSL \
+ 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xF2EDC64DC5AEE1F6B9C621F0C8CAB6595FDFF622' \
+ | apt-key add - ))
# Parse the current repo list into a debug repo list
RUN sed -n '/^deb /s,^deb [^ ]* ,deb http://ddebs.ubuntu.com ,p' \