From c599df4535b852a36a78bdde661e6c0d02a5aee0 Mon Sep 17 00:00:00 2001 From: nolim1t Date: Wed, 15 Sep 2021 10:24:21 +0700 Subject: [PATCH] Resolve the keys issue. lets combine it in all one go and see --- 22.0/Dockerfile | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/22.0/Dockerfile b/22.0/Dockerfile index 6366cde..4d82ce2 100644 --- a/22.0/Dockerfile +++ b/22.0/Dockerfile @@ -37,16 +37,13 @@ RUN sed -i 's|http://dl-cdn.alpinelinux.org|https://alpine.global.ssl.fastly.net RUN apk add --no-cache gnupg # Bitcoin keys -ENV KEYS 71A3B16735405025D447E8F274810B012346C9A6 01EA5486DE18A882D4C2684590C8019E36C2E964 0CCBAAFD76A2ECE2CCD3141DE2FFD5B1D88CA97D 152812300785C96444D3334D17565732E08E5E41 0AD83877C1F0CD1EE9BD660AD7CC770B81FD22A8 590B7292695AFFA5B672CBB2E13FC145CD3F4304 28F5900B1BB5D1A4B6B6D1A9ED357015286A333D CFB16E21C950F67FA95E558F2EEB9F5CC09526C1 6E01EEC9656903B0542B8F1003DB6322267C373B D1DBF2C4B96F2DEBF4C16654410108112E7EA81F 9D3CC86A72F8494342EA5FD10A41BDC3F4FAFF1C 74E2DEF5D77260B98BC19438099BAD163C70FBFA -# New keys -ENV KEYS2 637DB1E23370F84AFF88CCE03152347D07DA627C 82921A4B88FD454B7EB8CE3C796C4109063D4EAF +ENV KEYS 71A3B16735405025D447E8F274810B012346C9A6 01EA5486DE18A882D4C2684590C8019E36C2E964 0CCBAAFD76A2ECE2CCD3141DE2FFD5B1D88CA97D 152812300785C96444D3334D17565732E08E5E41 0AD83877C1F0CD1EE9BD660AD7CC770B81FD22A8 590B7292695AFFA5B672CBB2E13FC145CD3F4304 28F5900B1BB5D1A4B6B6D1A9ED357015286A333D CFB16E21C950F67FA95E558F2EEB9F5CC09526C1 6E01EEC9656903B0542B8F1003DB6322267C373B D1DBF2C4B96F2DEBF4C16654410108112E7EA81F 9D3CC86A72F8494342EA5FD10A41BDC3F4FAFF1C 74E2DEF5D77260B98BC19438099BAD163C70FBFA 637DB1E23370F84AFF88CCE03152347D07DA627C 82921A4B88FD454B7EB8CE3C796C4109063D4EAF -RUN timeout 32s gpg --keyserver keyserver.ubuntu.com --recv-keys $KEYS -RUN timeout 32s gpg --keyserver keys.openpgp.org --recv-keys $KEYS2 +RUN timeout 32s gpg --keyserver keys.openpgp.org --recv-keys $KEYS # Print imported keys, but also ensure there's no other keys in the system -#RUN gpg --list-keys | tail -n +3 | tee /tmp/keys.txt && \ -# gpg --list-keys $KEYS | diff - /tmp/keys.txt +RUN gpg --list-keys | tail -n +3 | tee /tmp/keys.txt && \ + gpg --list-keys $KEYS | diff - /tmp/keys.txt