Skip to content

Capnproto fixups #43

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Aug 21, 2025
Merged

Capnproto fixups #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af8053a
master: bump debian image to Trixie
willcl-ark Aug 21, 2025
414db3a
master: add capnproto dependencies
willcl-ark Aug 21, 2025
c0ccace
master-alpine: add capnproto dependency
willcl-ark Aug 21, 2025
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
28 changes: 18 additions & 10 deletions master/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
FROM debian:bookworm-slim AS build
FROM debian:trixie-slim AS build

LABEL maintainer.0="Will Clark (@willcl-ark)"

RUN apt-get update -y \
&& apt-get install -y \
RUN apt-get update --yes \
&& apt-get install --yes --no-install-recommends \
build-essential \
ca-certificates \
capnproto \
ccache \
clang-16 \
clang-19 \
cmake \
git \
libboost-dev \
libcapnp-dev \
libevent-dev \
libsqlite3-dev \
libzmq3-dev \
pkg-config \
python3 \
systemtap-sdt-dev \
--no-install-recommends \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

Expand All @@ -40,16 +41,16 @@ RUN set -ex \
-DBUILD_TX=ON \
-DBUILD_UTIL=OFF \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DCMAKE_CXX_COMPILER=clang++-16 \
-DCMAKE_C_COMPILER=clang-16 \
-DCMAKE_CXX_COMPILER=clang++-19 \
-DCMAKE_C_COMPILER=clang-19 \
-DCMAKE_INSTALL_PREFIX:PATH="${BITCOIN_PREFIX}" \
-DWITH_CCACHE=ON \
&& cmake --build build -j$(nproc) \
&& strip build/bin/bitcoin-cli build/bin/bitcoin-tx build/bin/bitcoind \
&& cmake --install build

# Second stage
FROM debian:bookworm-slim
FROM debian:trixie-slim

ARG UID=101
ARG GID=101
Expand All @@ -58,8 +59,15 @@ ENV BITCOIN_DATA=/home/bitcoin/.bitcoin

RUN groupadd --gid ${GID} bitcoin \
&& useradd --create-home --no-log-init -u ${UID} -g ${GID} bitcoin \
&& apt-get update -y \
&& apt-get install -y gosu libevent-dev libboost-dev libsqlite3-dev libzmq3-dev systemtap-sdt-dev --no-install-recommends \
&& apt-get update --yes \
&& apt-get install --yes --no-install-recommends \
capnproto \
gosu \
libboost-dev \
libevent-dev \
libsqlite3-dev \
libzmq3-dev \
systemtap-sdt-dev \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

Expand Down
3 changes: 3 additions & 0 deletions master/alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ FROM alpine:3.21 AS build
RUN apk --no-cache add \
boost-dev \
build-base \
capnproto \
capnproto-dev \
ccache \
chrpath \
clang18 \
Expand Down Expand Up @@ -55,6 +57,7 @@ RUN addgroup --gid ${GID} --system bitcoin && \
adduser --uid ${UID} --system bitcoin --ingroup bitcoin
RUN apk --no-cache add \
bash \
capnproto \
libevent \
libzmq \
shadow \
Expand Down