From a6186459509540c4b6e23523b6e178e9ca505a0a Mon Sep 17 00:00:00 2001 From: Diego Lendoiro Date: Thu, 1 Jun 2017 13:16:50 +0200 Subject: [PATCH] Added check for already existent gpg keys. Fixes #12 --- bin/docker-entrypoint.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/docker-entrypoint.sh b/bin/docker-entrypoint.sh index a3eb6c2..87af391 100755 --- a/bin/docker-entrypoint.sh +++ b/bin/docker-entrypoint.sh @@ -29,8 +29,11 @@ EOF" -ls /bin/bash nginx } gpg_import_key() { - su -m -c "$gpg --batch --import $gpg_private_key" -ls /bin/bash nginx + + local key_id=$(su -m -c "gpg --with-colons $gpg_private_key | grep sec |cut -f5 -d:" -ls /bin/bash nginx) + su -m -c "$gpg --batch --import $gpg_public_key" -ls /bin/bash nginx + su -m -c "gpg -K $key_id" -ls /bin/bash nginx || su -m -c "$gpg --batch --import $gpg_private_key" -ls /bin/bash nginx } core_setup() {