Merge branch 'master' of https://github.com/lncm/docker-bitcoind

lncm · Jun 2, 2023 · 6a6898c · 6a6898c
2 parents 69d3ef6 + f7909b7
commit 6a6898c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 28 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,12 +18,6 @@ jobs:
       fail-fast: false
       matrix:
         subver:
-          - '0.16'
-          - '0.17'
-          - '0.18'
-          - '0.19'
-          - '0.20'
-          - '0.21'
           - '22.0'
           - '23.0'
           - '24.0'
@@ -73,11 +67,7 @@ jobs:
           run bitcoind | head -n 1
           run bitcoin-cli
           run bitcoin-tx --help | head -n 1
-
-          # If version higher, or equal than v0.18.0, also run `bitcoin-wallet` binary
-          if [ "${MINOR#0.}" -ge "18" ]; then
-            run bitcoin-wallet --help | head -n 1
-          fi
+          run bitcoin-wallet --help | head -n 1
 
           run uname -a
           run cat /etc/os-release

diff --git a/22.0/Dockerfile b/22.0/Dockerfile
@@ -3,7 +3,7 @@
 # VERSION of Bitcoin Core to be build
 #   NOTE: Unlike our other images this one is NOT prefixed with `v`,
 #           as many things (like download URLs) use this form instead.
-ARG VERSION=22.0
+ARG VERSION=22.1
 
 # CPU architecture to build binaries for
 ARG ARCH
@@ -34,24 +34,20 @@ FROM alpine:${VER_ALPINE} AS preparer-base
 # Make sure APKs are downloaded over SSL. See: https://github.com/gliderlabs/docker-alpine/issues/184
 RUN sed -i 's|http://dl-cdn.alpinelinux.org|https://alpine.global.ssl.fastly.net|g' /etc/apk/repositories
 
-RUN apk add --no-cache  gnupg
-
-# Bitcoin keys (all)
-ENV KEYS 71A3B16735405025D447E8F274810B012346C9A6 01EA5486DE18A882D4C2684590C8019E36C2E964 0CCBAAFD76A2ECE2CCD3141DE2FFD5B1D88CA97D 152812300785C96444D3334D17565732E08E5E41 0AD83877C1F0CD1EE9BD660AD7CC770B81FD22A8 590B7292695AFFA5B672CBB2E13FC145CD3F4304 28F5900B1BB5D1A4B6B6D1A9ED357015286A333D CFB16E21C950F67FA95E558F2EEB9F5CC09526C1 6E01EEC9656903B0542B8F1003DB6322267C373B D1DBF2C4B96F2DEBF4C16654410108112E7EA81F 9D3CC86A72F8494342EA5FD10A41BDC3F4FAFF1C 74E2DEF5D77260B98BC19438099BAD163C70FBFA 637DB1E23370F84AFF88CCE03152347D07DA627C 82921A4B88FD454B7EB8CE3C796C4109063D4EAF
-# keys to fetch from ubuntu keyserver
-ENV KEYS1 71A3B16735405025D447E8F274810B012346C9A6 01EA5486DE18A882D4C2684590C8019E36C2E964 0CCBAAFD76A2ECE2CCD3141DE2FFD5B1D88CA97D 152812300785C96444D3334D17565732E08E5E41 0AD83877C1F0CD1EE9BD660AD7CC770B81FD22A8 590B7292695AFFA5B672CBB2E13FC145CD3F4304 28F5900B1BB5D1A4B6B6D1A9ED357015286A333D CFB16E21C950F67FA95E558F2EEB9F5CC09526C1 6E01EEC9656903B0542B8F1003DB6322267C373B D1DBF2C4B96F2DEBF4C16654410108112E7EA81F 9D3CC86A72F8494342EA5FD10A41BDC3F4FAFF1C 74E2DEF5D77260B98BC19438099BAD163C70FBFA
-# keys to fetch from keys.openpgp.org
-ENV KEYS2 637DB1E23370F84AFF88CCE03152347D07DA627C 82921A4B88FD454B7EB8CE3C796C4109063D4EAF
-
-# Run twop different keys command
-RUN timeout 32s gpg  --keyserver keyserver.ubuntu.com  --recv-keys $KEYS1
-RUN timeout 32s gpg  --keyserver keys.openpgp.org  --recv-keys $KEYS2
-
-# 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 apk add --no-cache gnupg
 
+# Guix Builder Keys: https://github.com/bitcoin-core/guix.sigs/tree/main/builder-keys
+# curl -s "https://api.github.com/repos/bitcoin-core/guix.sigs/contents/builder-keys" | jq -r '.[].download_url'
+ENV KEYS 982A193E3CE0EED535E09023188CBB2648416AD5 101598DC823C1B5F9A6624ABA5E0907A0380E6C3 9EDAFF80E080659604F4A76B2EBB056FD847F8A7 \
+         ED9BDF7AD6A55E232E84524257FF9BDBCC301009 A8FC55F3B04BA3146F3492E79303B33A305224CB 152812300785C96444D3334D17565732E08E5E41 \
+         0AD83877C1F0CD1EE9BD660AD7CC770B81FD22A8 C060A6635913D98A3587D7DB1C2491FFEB0EF770 590B7292695AFFA5B672CBB2E13FC145CD3F4304 \
+         948444FCE03B05BA5AB0591EC37B1C1D44C786EE E777299FC265DD04793070EB944D35F9AC3DB76A 6B002C6EA3F91B1B0DF0C9BC8F617F1200A6D25C \
+         F4FC70F07310028424EFC20A8E4256593F177720 D1DBF2C4B96F2DEBF4C16654410108112E7EA81F 287AE4CA1187C68C08B49CB2D11BD4F33F1DB499 \
+         616516B8EB6ED02882FC4A7A8ADCB558C4F33D65 71A3B16735405025D447E8F274810B012346C9A6 2F78ACF677029767C8736F13747A7AE2FB0FD25B \
+         133EAC179436F14A5CF1B794860FEB804E669320 9ED99C7A355AE46098103E74476E74C8529A9006 6A8F9C266528E25AEB1D7731C2371D91CB716EA7 \
+         28E72909F1717FE9607754F8A7BEB2621678D37D 67AA5B46E7AF78053167FE343B8F814A784218F8 79D00BAC68B56D422F945A8F8E3A8F3247DBCBBF
 
+RUN gpg --keyserver keyserver.ubuntu.com --recv-keys $KEYS
 
 #
 ## Option #1: [default] Fetch bitcoind source from release tarballs