Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for Bitcoin Core v25.0 #2

Merged
merged 1 commit into from
Jul 23, 2023
Merged

Add support for Bitcoin Core v25.0 #2

merged 1 commit into from
Jul 23, 2023

Conversation

calvinrzachman
Copy link

No description provided.

@calvinrzachman
Copy link
Author

calvinrzachman commented Jul 13, 2023

The diff between the files for v24.0 is just the version bump plus a few changes to the set of signers:

➜  docker-bitcoin-core git:(bitcoin-v25.0) ✗ git diff --no-index ./24/alpine/Dockerfile ./25/alpine/Dockerfile
diff --git a/./24/alpine/Dockerfile b/./25/alpine/Dockerfile
index 5b3a396..ff58194 100644
--- a/./24/alpine/Dockerfile
+++ b/./25/alpine/Dockerfile
@@ -43,18 +43,19 @@ RUN apk --no-cache add sqlite-dev
 RUN apk --no-cache add zeromq-dev
 RUN set -ex \
   && for key in \
+  101598DC823C1B5F9A6624ABA5E0907A0380E6C3 \
+  F2CFC4ABD0B99D837EEBB7D09B79B45691DB4173 \
   152812300785C96444D3334D17565732E08E5E41 \
   0AD83877C1F0CD1EE9BD660AD7CC770B81FD22A8 \
-  590B7292695AFFA5B672CBB2E13FC145CD3F4304 \
+  C060A6635913D98A3587D7DB1C2491FFEB0EF770 \
   CFB16E21C950F67FA95E558F2EEB9F5CC09526C1 \
+  F19F5FF2B0589EC341220045BA03F4DBE0C63FB4 \
   F4FC70F07310028424EFC20A8E4256593F177720 \
   D1DBF2C4B96F2DEBF4C16654410108112E7EA81F \
   287AE4CA1187C68C08B49CB2D11BD4F33F1DB499 \
   9DEAE0DC7063249FB05474681E4AED62986CD25D \
-  3EB0DEE6004A13BE5A0CC758BF2978B068054311 \
-  ED9BDF7AD6A55E232E84524257FF9BDBCC301009 \
+  6A8F9C266528E25AEB1D7731C2371D91CB716EA7 \
   28E72909F1717FE9607754F8A7BEB2621678D37D \
-  79D00BAC68B56D422F945A8F8E3A8F3247DBCBBF \
   ; do \
   gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" || \
   gpg --batch --keyserver keys.openpgp.org --recv-keys "$key" || \
@@ -63,7 +64,7 @@ RUN set -ex \
   gpg --batch --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys "$key" ; \
   done

-ENV BITCOIN_VERSION=24.0.1
+ENV BITCOIN_VERSION=25.0
 ENV BITCOIN_PREFIX=/opt/bitcoin-${BITCOIN_VERSION}

 RUN wget https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}/SHA256SUMS
@@ -120,7 +121,7 @@ RUN apk --no-cache add \
   su-exec

 ENV BITCOIN_DATA=/home/bitcoin/.bitcoin
-ENV BITCOIN_VERSION=24.0.1
+ENV BITCOIN_VERSION=25.0
 ENV BITCOIN_PREFIX=/opt/bitcoin-${BITCOIN_VERSION}
 ENV PATH=${BITCOIN_PREFIX}/bin:$PATH

➜  docker-bitcoin-core git:(bitcoin-v25.0) ✗ git diff --no-index ./24/Dockerfile ./25/Dockerfile
diff --git a/./24/Dockerfile b/./25/Dockerfile
index 6d62d76..4f0c1bb 100644
--- a/./24/Dockerfile
+++ b/./25/Dockerfile
@@ -15,7 +15,7 @@ RUN groupadd --gid ${GID} bitcoin \
   && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

 ARG TARGETPLATFORM
-ENV BITCOIN_VERSION=24.0.1
+ENV BITCOIN_VERSION=25.0
 ENV BITCOIN_DATA=/home/bitcoin/.bitcoin
 ENV PATH=/opt/bitcoin-${BITCOIN_VERSION}/bin:$PATH

@@ -24,18 +24,19 @@ RUN set -ex \
   && if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then export TARGETPLATFORM=aarch64-linux-gnu; fi \
   && if [ "${TARGETPLATFORM}" = "linux/arm/v7" ]; then export TARGETPLATFORM=arm-linux-gnueabihf; fi \
   && for key in \
+  101598DC823C1B5F9A6624ABA5E0907A0380E6C3 \
+  F2CFC4ABD0B99D837EEBB7D09B79B45691DB4173 \
   152812300785C96444D3334D17565732E08E5E41 \
   0AD83877C1F0CD1EE9BD660AD7CC770B81FD22A8 \
-  590B7292695AFFA5B672CBB2E13FC145CD3F4304 \
+  C060A6635913D98A3587D7DB1C2491FFEB0EF770 \
   CFB16E21C950F67FA95E558F2EEB9F5CC09526C1 \
+  F19F5FF2B0589EC341220045BA03F4DBE0C63FB4 \
   F4FC70F07310028424EFC20A8E4256593F177720 \
   D1DBF2C4B96F2DEBF4C16654410108112E7EA81F \
   287AE4CA1187C68C08B49CB2D11BD4F33F1DB499 \
   9DEAE0DC7063249FB05474681E4AED62986CD25D \
-  3EB0DEE6004A13BE5A0CC758BF2978B068054311 \
-  ED9BDF7AD6A55E232E84524257FF9BDBCC301009 \
+  6A8F9C266528E25AEB1D7731C2371D91CB716EA7 \
   28E72909F1717FE9607754F8A7BEB2621678D37D \
-  79D00BAC68B56D422F945A8F8E3A8F3247DBCBBF \
   ; do \
   gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" || \
   gpg --batch --keyserver keys.openpgp.org --recv-keys "$key" || \

@calvinrzachman calvinrzachman changed the title Add support for Bitcoin Core v25.0 WIP: Add support for Bitcoin Core v25.0 Jul 13, 2023
@calvinrzachman calvinrzachman changed the title WIP: Add support for Bitcoin Core v25.0 Add support for Bitcoin Core v25.0 Jul 13, 2023
@Roasbeef Roasbeef requested a review from djkazic July 14, 2023 01:32
@lightninglabs-deploy
Copy link

@djkazic: review reminder

@Roasbeef Roasbeef merged commit 744862b into master Jul 23, 2023
@guggero guggero deleted the bitcoin-v25.0 branch July 24, 2023 07:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants