Merge pull request #68 from willcl-ark/30.2

Author: willcl-ark

.github/workflows/build.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   pull_request:
     paths:
-      - '30.2rc1/**'
+      - '30.2/**'
       - '29.2/**'
       - '28.3/**'
       - '27.2/**'
@@ -15,8 +15,8 @@ jobs:
     strategy:
       matrix:
         version:
-          - '30.2rc1/alpine'
-          - '30.2rc1'
+          - '30.2/alpine'
+          - '30.2'
       fail-fast: true
     steps:
       - name: Checkout

30.2/Dockerfile

@@ -0,0 +1,70 @@
+FROM debian:bookworm-slim AS builder
+
+LABEL maintainer.0="Will Clark (@willcl-ark)"
+
+RUN apt-get update -y \
+  && apt-get install -y ca-certificates curl git gnupg gosu python3 wget --no-install-recommends \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+ARG TARGETPLATFORM
+ENV BITCOIN_VERSION=30.2
+ENV SIGS_REPO_URL="https://github.com/bitcoin-core/guix.sigs.git"
+ENV SIGS_CLONE_DIR="guix.sigs"
+ENV VERIFY_SCRIPT_URL="https://raw.githubusercontent.com/bitcoin/bitcoin/v${BITCOIN_VERSION}/contrib/verify-binaries/verify.py"
+ENV TMPDIR="/tmp/bitcoin_verify_binaries"
+
+RUN set -ex \
+  && if echo $BITCOIN_VERSION | grep -q "rc" ; then \
+       VERIFY_VERSION=$(echo $BITCOIN_VERSION | sed 's/\(.*\)rc\([0-9]*\)/\1-rc\2/'); \
+     else \
+       VERIFY_VERSION=$BITCOIN_VERSION; \
+     fi \
+  && echo "$VERIFY_VERSION" \
+  && if [ "${TARGETPLATFORM}" = "linux/amd64" ]; then export TARGETPLATFORM=x86_64-linux-gnu; fi \
+  && if [ "${TARGETPLATFORM}" = "linux/arm64" ]; then export TARGETPLATFORM=aarch64-linux-gnu; fi \
+  && if [ "${TARGETPLATFORM}" = "linux/arm/v7" ]; then export TARGETPLATFORM=arm-linux-gnueabihf; fi \
+  && git clone ${SIGS_REPO_URL} ${SIGS_CLONE_DIR} \
+  && gpg --import "${SIGS_CLONE_DIR}"/builder-keys/* \
+  && curl -o verify.py ${VERIFY_SCRIPT_URL} \
+  && chmod +x verify.py \
+  && ./verify.py \
+    --min-good-sigs 6 pub "${VERIFY_VERSION}-${TARGETPLATFORM}" \
+  && tar -xzf "${TMPDIR}.${VERIFY_VERSION}-${TARGETPLATFORM}/bitcoin-${BITCOIN_VERSION}-${TARGETPLATFORM}.tar.gz" -C /opt \
+  && rm -rf ${SIGS_CLONE_DIR} \
+  && rm -rf ${TMPDIR} \
+  && rm -rf /opt/bitcoin-${BITCOIN_VERSION}/bin/bitcoin-qt
+
+# Second stage
+FROM debian:bookworm-slim
+
+ARG UID=101
+ARG GID=101
+
+ENV BITCOIN_DATA=/home/bitcoin/.bitcoin
+ENV BITCOIN_VERSION=30.2
+ENV PATH=/opt/bitcoin-${BITCOIN_VERSION}/bin:$PATH
+
+RUN groupadd --gid ${GID} bitcoin \
+  && if echo "$BITCOIN_VERSION" | grep -q "rc"; then \
+       PADDED_VERSION=$(echo $BITCOIN_VERSION | sed 's/\([0-9]\+\)\.\([0-9]\+\)rc/\1.\2.0rc/'); \
+     else \
+       PADDED_VERSION=$BITCOIN_VERSION; \
+     fi \
+  && echo "Padded version: $PADDED_VERSION" \
+  && useradd --create-home --no-log-init -u ${UID} -g ${GID} bitcoin \
+  && apt-get update -y \
+  && apt-get install -y gosu --no-install-recommends \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+COPY --from=builder /opt/bitcoin-${BITCOIN_VERSION} /opt/bitcoin-${BITCOIN_VERSION}
+
+COPY docker-entrypoint.sh /entrypoint.sh
+
+VOLUME ["/home/bitcoin/.bitcoin"]
+EXPOSE 8332 8333 18332 18333 18443 18444 38333 38332
+
+ENTRYPOINT ["/entrypoint.sh"]
+RUN bitcoind -version | grep "Bitcoin Core daemon version v${PADDED_VERSION}"
+CMD ["bitcoind"]

30.2/alpine/Dockerfile

@@ -0,0 +1,108 @@
+# Build stage for Bitcoin Core
+FROM alpine:3.22 AS build
+
+ENV CLANG_V=20
+
+RUN apk --no-cache add \
+    boost-dev \
+    build-base \
+    capnproto \
+    capnproto-dev \
+    "clang${CLANG_V}" \
+    cmake \
+    file \
+    git \
+    gnupg \
+    libevent-dev \
+    linux-headers \
+    pkgconf \
+    python3 \
+    sqlite-dev \
+    zeromq-dev
+
+ENV BITCOIN_VERSION=30.2
+ENV BITCOIN_PREFIX=/opt/bitcoin-${BITCOIN_VERSION}
+ENV BITCOIN_SOURCE_DIR=/bitcoin/src
+ENV SIGS_REPO_URL="https://github.com/bitcoin-core/guix.sigs.git"
+ENV SIGS_CLONE_DIR="guix.sigs"
+ENV VERIFY_SCRIPT_URL="https://raw.githubusercontent.com/bitcoin/bitcoin/v${BITCOIN_VERSION}/contrib/verify-binaries/verify.py"
+
+WORKDIR /bitcoin
+
+RUN set -ex \
+  && if echo $BITCOIN_VERSION | grep -q "rc" ; then \
+       VERIFY_VERSION=$(echo $BITCOIN_VERSION | sed 's/\(.*\)rc\([0-9]*\)/\1-rc\2/'); \
+       ADDRESS="https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION%%rc*}/test.rc${BITCOIN_VERSION##*rc}"; \
+     else \
+       VERIFY_VERSION=$BITCOIN_VERSION; \
+       ADDRESS="https://bitcoincore.org/bin/bitcoin-core-${VERIFY_VERSION}"; \
+     fi \
+  && echo "$VERIFY_VERSION" \
+  && wget ${ADDRESS}/bitcoin-${BITCOIN_VERSION}.tar.gz \
+  && wget ${ADDRESS}/SHA256SUMS \
+  && wget ${ADDRESS}/SHA256SUMS.asc \
+  && git clone ${SIGS_REPO_URL} ${SIGS_CLONE_DIR} \
+  && gpg --import "${SIGS_CLONE_DIR}"/builder-keys/* \
+  && wget -O verify.py ${VERIFY_SCRIPT_URL} \
+  && chmod +x verify.py \
+  && ./verify.py bin SHA256SUMS \
+    "bitcoin-${BITCOIN_VERSION}.tar.gz" \
+  && mkdir -p ${BITCOIN_SOURCE_DIR} \
+  && tar -xzf "bitcoin-${BITCOIN_VERSION}.tar.gz" -C ${BITCOIN_SOURCE_DIR} \
+  && rm -rf ${SIGS_CLONE_DIR}
+
+WORKDIR "${BITCOIN_SOURCE_DIR}/bitcoin-${BITCOIN_VERSION}"
+
+RUN cmake -B build \
+    -DBUILD_TESTS=OFF \
+    -DBUILD_TX=ON \
+    -DBUILD_UTIL=OFF \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_CXX_COMPILER="clang++-${CLANG_V}" \
+    -DCMAKE_C_COMPILER="clang-${CLANG_V}" \
+    -DCMAKE_INSTALL_PREFIX:PATH="${BITCOIN_PREFIX}" && \
+    cmake --build build -j$(nproc) && \
+    strip build/bin/bitcoin-cli build/bin/bitcoin-tx build/bin/bitcoind build/bin/bitcoin build/bin/bitcoin-node && \
+    cmake --install build
+
+# Build stage for compiled artifacts
+FROM alpine:3.21
+
+ARG UID=100
+ARG GID=101
+
+LABEL maintainer.0="Will Clark (@willcl-ark)"
+
+RUN addgroup bitcoin --gid ${GID} --system
+RUN adduser --uid ${UID} --system bitcoin --ingroup bitcoin
+RUN apk --no-cache add \
+  capnproto \
+  libevent \
+  libzmq \
+  shadow \
+  sqlite-libs \
+  su-exec
+
+ENV BITCOIN_DATA=/home/bitcoin/.bitcoin
+ENV BITCOIN_VERSION=30.2
+ENV BITCOIN_PREFIX=/opt/bitcoin-${BITCOIN_VERSION}
+ENV PATH=/opt/bin:$PATH
+
+COPY --from=build ${BITCOIN_PREFIX} /opt
+COPY docker-entrypoint.sh /entrypoint.sh
+
+RUN if echo "$BITCOIN_VERSION" | grep -q "rc"; then \
+    PADDED_VERSION=$(echo $BITCOIN_VERSION | sed 's/\([0-9]\+\)\.\([0-9]\+\)rc/\1.\2.0rc/'); \
+  else \
+    PADDED_VERSION=$BITCOIN_VERSION; \
+  fi
+
+VOLUME ["/home/bitcoin/.bitcoin"]
+
+EXPOSE 8332 8333 18332 18333 18444
+
+ENTRYPOINT ["/entrypoint.sh"]
+
+RUN bitcoind -version | grep "Bitcoin Core daemon version v${PADDED_VERSION}"
+
+CMD ["bitcoind"]

30.2rc1/alpine/docker-entrypoint.sh 30.2/alpine/docker-entrypoint.sh30.2rc1/alpine/docker-entrypoint.sh renamed to 30.2/alpine/docker-entrypoint.sh

@@ -26,11 +26,11 @@
 
 ## Tags
 
-- `30.2rc1` ([30.2rc1/Dockerfile](https://github.com/willcl-ark/bitcoin-core-docker/blob/master/30.2rc1/Dockerfile)) [**multi-platform**]
-- `30.2rc1-alpine` ([30.2rc1/alpine/Dockerfile](https://github.com/willcl-ark/bitcoin-core-docker/blob/master/30.2rc1/alpine/Dockerfile))
+- `30.2`, `30`, `latest` ([30.2/Dockerfile](https://github.com/willcl-ark/bitcoin-core-docker/blob/master/30.2/Dockerfile)) [**multi-platform**]
+- `30.2-alpine`, `30-alpine`, `alpine` ([30.2/alpine/Dockerfile](https://github.com/willcl-ark/bitcoin-core-docker/blob/master/30.2/alpine/Dockerfile))
 
-- `29.2`, `29`, `latest` ([29.2/Dockerfile](https://github.com/willcl-ark/bitcoin-core-docker/blob/master/29.2/Dockerfile)) [**multi-platform**]
-- `29.2-alpine`, `29-alpine`, `alpine` ([29.2/alpine/Dockerfile](https://github.com/willcl-ark/bitcoin-core-docker/blob/master/29.2/alpine/Dockerfile))
+- `29.2`, `29` ([29.2/Dockerfile](https://github.com/willcl-ark/bitcoin-core-docker/blob/master/29.2/Dockerfile)) [**multi-platform**]
+- `29.2-alpine`, `29-alpine` ([29.2/alpine/Dockerfile](https://github.com/willcl-ark/bitcoin-core-docker/blob/master/29.2/alpine/Dockerfile))
 
 - `28.3`, `28` ([28.3/Dockerfile](https://github.com/willcl-ark/bitcoin-core-docker/blob/master/28.3/Dockerfile)) [**multi-platform**]
 - `28.3-alpine`, `28-alpine` ([28.3/alpine/Dockerfile](https://github.com/willcl-ark/bitcoin-core-docker/blob/master/28.3/alpine/Dockerfile))

30.2rc1/docker-entrypoint.sh 30.2/docker-entrypoint.sh30.2rc1/docker-entrypoint.sh renamed to 30.2/docker-entrypoint.sh

@@ -0,0 +1,39 @@
+#!/bin/sh
+set -e
+
+if [ -n "${UID+x}" ] && [ "${UID}" != "0" ]; then
+  usermod -u "$UID" bitcoin
+fi
+
+if [ -n "${GID+x}" ] && [ "${GID}" != "0" ]; then
+  groupmod -g "$GID" bitcoin
+fi
+
+echo "$0: assuming uid:gid for bitcoin:bitcoin of $(id -u bitcoin):$(id -g bitcoin)"
+
+if [ "$(echo "$1" | cut -c1)" = "-" ]; then
+  echo "$0: assuming arguments for bitcoind"
+
+  set -- bitcoind "$@"
+fi
+
+if [ "$(echo "$1" | cut -c1)" = "-" ] || [ "$1" = "bitcoind" ]; then
+  mkdir -p "$BITCOIN_DATA"
+  chmod 700 "$BITCOIN_DATA"
+  # Fix permissions for home dir.
+  chown -R bitcoin:bitcoin "$(getent passwd bitcoin | cut -d: -f6)"
+  # Fix permissions for bitcoin data dir.
+  chown -R bitcoin:bitcoin "$BITCOIN_DATA"
+
+  echo "$0: setting data directory to $BITCOIN_DATA"
+
+  set -- "$@" -datadir="$BITCOIN_DATA"
+fi
+
+if [ "$1" = "bitcoind" ] || [ "$1" = "bitcoin-cli" ] || [ "$1" = "bitcoin-tx" ]; then
+  echo
+  exec su-exec bitcoin "$@"
+fi
+
+echo
+exec "$@"

README.md

@@ -0,0 +1,39 @@
+#!/bin/bash
+set -e
+
+if [ -n "${UID+x}" ] && [ "${UID}" != "0" ]; then
+  usermod -u "$UID" bitcoin
+fi
+
+if [ -n "${GID+x}" ] && [ "${GID}" != "0" ]; then
+  groupmod -g "$GID" bitcoin
+fi
+
+echo "$0: assuming uid:gid for bitcoin:bitcoin of $(id -u bitcoin):$(id -g bitcoin)"
+
+if [ "$(echo "$1" | cut -c1)" = "-" ]; then
+  echo "$0: assuming arguments for bitcoind"
+
+  set -- bitcoind "$@"
+fi
+
+if [ "$(echo "$1" | cut -c1)" = "-" ] || [ "$1" = "bitcoind" ]; then
+  mkdir -p "$BITCOIN_DATA"
+  chmod 700 "$BITCOIN_DATA"
+  # Fix permissions for home dir.
+  chown -R bitcoin:bitcoin "$(getent passwd bitcoin | cut -d: -f6)"
+  # Fix permissions for bitcoin data dir.
+  chown -R bitcoin:bitcoin "$BITCOIN_DATA"
+
+  echo "$0: setting data directory to $BITCOIN_DATA"
+
+  set -- "$@" -datadir="$BITCOIN_DATA"
+fi
+
+if [ "$1" = "bitcoind" ] || [ "$1" = "bitcoin-cli" ] || [ "$1" = "bitcoin-tx" ]; then
+  echo
+  exec gosu bitcoin "$@"
+fi
+
+echo
+exec "$@"