Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bitcoind/Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion bitcoind/Dockerfile.gitian
Original file line number Diff line number Diff line change
@@ -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

Expand Down
6 changes: 3 additions & 3 deletions bitcoind/README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Bitcoin

* `Dockerfile` downloads the compiled binaries from <https://bitcoincore.org>. The file was adapted from <https://github.com/jamesob/docker-bitcoind>
* `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:

<https://github.com/bitcoin/bitcoin/blob/v31.0/contrib/guix/INSTALL.md>
<https://github.com/bitcoin/bitcoin/blob/v31.1/contrib/guix/INSTALL.md>

Then run the source build from this directory:

Expand Down
2 changes: 1 addition & 1 deletion bitcoind/build-and-push-to-dockerhub.sh
Original file line number Diff line number Diff line change
@@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion bitcoind/run-gitian.sh
Original file line number Diff line number Diff line change
@@ -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" "$@"
2 changes: 1 addition & 1 deletion bitcoind/run-guix.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down