From 6994202efcaea352f016a35e32a87f599dafe936 Mon Sep 17 00:00:00 2001 From: Velsoth Date: Thu, 14 Nov 2019 05:26:32 +0000 Subject: [PATCH] Some measures to make sure gpg is happy --- Dockerfile | 4 +++- entrypoint.sh | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2eba348..72899dd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -64,7 +64,9 @@ RUN cat /etc/apt/sources.list | sed "s/deb /deb-src /g" >> /etc/apt/sources.list lzop \ && mkdir /build \ && git config --global user.email "replicant@localhost" \ - && git config --global user.name "replicant" + && git config --global user.name "replicant" \ + && mkdir -p ~/.gnupg \ + && echo "disable-ipv6" >> ~/.gnupg/dirmngr.conf ADD entrypoint.sh /entrypoint.sh diff --git a/entrypoint.sh b/entrypoint.sh index 66322f6..f543e0c 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -14,14 +14,19 @@ function initializeSourceTree() { } function repoSync() { - repo sync + repo sync "$@" } function getPrebuilts() { cd "$build_directory" + # TODO: Add persistence for the gpg keyring and avoid + # pulling keys when unecessary gpg \ --keyserver pool.sks-keyservers.net \ --recv-key 7A029E54DD5DCE7A + gpg \ + --keyserver pool.sks-keyservers.net \ + --recv-key A801183E69B37AA9 bash ./vendor/replicant/get-prebuilts } @@ -101,7 +106,8 @@ else ;; -p | --pull ) - repoSync + options="${@:2}" + repoSync "$options" ;; -t | --build-toolchain )