diff --git a/bitcoind/Dockerfile b/bitcoind/Dockerfile index 96e2987..fb6458d 100644 --- a/bitcoind/Dockerfile +++ b/bitcoind/Dockerfile @@ -1,7 +1,7 @@ FROM debian:bookworm-slim ARG TARGETARCH TARGETOS -ARG BITCOIN_VERSION=31.0 +ARG BITCOIN_VERSION=31.1 ENV BITCOIN_VERSION=$BITCOIN_VERSION ENV WLADIMIRVDL_PGP_FINGERPRINT=71A3B16735405025D447E8F274810B012346C9A6 ENV ACHOW_PGP_FINGERPRINT=152812300785C96444D3334D17565732E08E5E41 diff --git a/bitcoind/Dockerfile.gitian b/bitcoind/Dockerfile.gitian index 2141ad5..072cd80 100644 --- a/bitcoind/Dockerfile.gitian +++ b/bitcoind/Dockerfile.gitian @@ -1,5 +1,5 @@ # Dockerfile.gitian is kept as a compatibility alias for older commands. -# Bitcoin Core 31.0 uses Guix for reproducible builds; prefer Dockerfile.guix. +# Bitcoin Core 31.1 uses Guix for reproducible builds; prefer Dockerfile.guix. FROM debian:bookworm-slim diff --git a/bitcoind/README.md b/bitcoind/README.md index 1b92c6a..e636c56 100644 --- a/bitcoind/README.md +++ b/bitcoind/README.md @@ -1,15 +1,15 @@ # Bitcoin * `Dockerfile` downloads the compiled binaries from . The file was adapted from -* `Dockerfile.guix` packages a locally built Bitcoin Core tree from `./bitcoin`. Bitcoin Core 31.0 uses [Guix](https://github.com/bitcoin/bitcoin/tree/v31.0/contrib/guix), not Gitian, for reproducible source builds. +* `Dockerfile.guix` packages a locally built Bitcoin Core tree from `./bitcoin`. Bitcoin Core 31.1 uses [Guix](https://github.com/bitcoin/bitcoin/tree/v31.1/contrib/guix), not Gitian, for reproducible source builds. -The default Bitcoin Core version is `31.0` for downloaded binaries and `v31.0` for source builds. Override with `VER=...` for `build-and-push-to-dockerhub.sh` or `BITCOIN_VERSION=...` for `run-guix.sh`. +The default Bitcoin Core version is `31.1` for downloaded binaries and `v31.1` for source builds. Override with `VER=...` for `build-and-push-to-dockerhub.sh` or `BITCOIN_VERSION=...` for `run-guix.sh`. ## Building from source Install and configure Guix once by following Bitcoin Core's Guix setup guide: - + Then run the source build from this directory: diff --git a/bitcoind/build-and-push-to-dockerhub.sh b/bitcoind/build-and-push-to-dockerhub.sh index 902522d..b934204 100755 --- a/bitcoind/build-and-push-to-dockerhub.sh +++ b/bitcoind/build-and-push-to-dockerhub.sh @@ -1,7 +1,7 @@ #!/bin/sh set -ex -export VER=${VER:-31.0} +export VER=${VER:-31.1} docker buildx build --platform linux/amd64,linux/arm64 \ --push \ --cache-from blockstream/bitcoind:latest \ diff --git a/bitcoind/run-gitian.sh b/bitcoind/run-gitian.sh index a876695..c8fd26d 100755 --- a/bitcoind/run-gitian.sh +++ b/bitcoind/run-gitian.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash -echo "run-gitian.sh is deprecated for Bitcoin Core 31.0; use run-guix.sh instead." >&2 +echo "run-gitian.sh is deprecated for Bitcoin Core 31.1; use run-guix.sh instead." >&2 exec "$(dirname "$0")/run-guix.sh" "$@" diff --git a/bitcoind/run-guix.sh b/bitcoind/run-guix.sh index 7029f91..8424f5c 100755 --- a/bitcoind/run-guix.sh +++ b/bitcoind/run-guix.sh @@ -2,7 +2,7 @@ set -euo pipefail -BITCOIN_VERSION=${BITCOIN_VERSION:-v31.0} +BITCOIN_VERSION=${BITCOIN_VERSION:-v31.1} BITCOIN_DIR=${BITCOIN_VERSION#v} HOSTS=${HOSTS:-x86_64-linux-gnu} JOBS=${JOBS:-2}