From 84d732f7f67aa7bef5be419234f92ab26815d8af Mon Sep 17 00:00:00 2001
From: Oscar Fawkes <oscar@ocf.sh>
Date: Sat, 31 May 2025 18:47:37 +1000
Subject: [PATCH 1/2] bump v29, new toolchain

---
 Dockerfile | 32 +++++++++++++++-----------------
 VERSION    |  2 +-
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a0ad1b3..f78dda9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,29 +21,27 @@ RUN git clone --depth 1 https://github.com/bitcoin/bitcoin.git --branch v$VERSIO
 
 WORKDIR /bitcoin
 
-RUN cd /bitcoin/depends; make NO_QT=1 -j"$(($(nproc)+1))"
+RUN cd /bitcoin/depends; \
+    make NO_QT=1 -j"$(($(nproc)+1))"
 
 RUN wget https://zlib.net/zlib-1.3.1.tar.gz && \
     echo "9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23  zlib-1.3.1.tar.gz" | sha256sum -c && \
     mkdir -p /usr/src/zlib; tar zxvf zlib-1.3.1.tar.gz -C /usr/src && \
-    cd /usr/src/zlib-1.3.1; ./configure; make -j"$(($(nproc)+1))"; make -j"$(($(nproc)+1))" install
+    cd /usr/src/zlib-1.3.1; \
+    ./configure; \
+    make -j"$(($(nproc)+1))"; \
+    make -j"$(($(nproc)+1))" install
 
 RUN export CONFIG_SITE=/bitcoin/depends/$(/bitcoin/depends/config.guess)/share/config.site && \
-    cd /bitcoin; ./autogen.sh; \
-    ./configure --disable-ccache \
-    --disable-maintainer-mode \
-    --disable-dependency-tracking \
-    --enable-reduce-exports --disable-bench \
-    --disable-tests \
-    --disable-gui-tests \
-    --without-gui \
-    --without-miniupnpc \
-    CFLAGS="-O2 -g0 --static -static -fPIC" \
-    CXXFLAGS="-O2 -g0 --static -static -fPIC" \
-    LDFLAGS="-s -static-libgcc -static-libstdc++ -Wl,-O2"
-
-RUN make -j"$(($(nproc)+1))" && \
-    make -j"$(($(nproc)+1))" install
+    cd /bitcoin; \
+    cmake -B build \
+        -DENABLE_WALLET=OFF \
+        --toolchain depends/$(/bitcoin/depends/config.guess)/toolchain.cmake \
+        -DCMAKE_CXX_FLAGS="-O0 -g0 --static -static -fPIC"; \
+    cmake --build build \
+        -j$($(nproc)+1); \
+    ctest --test-dir build; \
+    cmake --install build;
 
 FROM alpine:latest
 COPY --from=build /usr/local /usr/local
diff --git a/VERSION b/VERSION
index 1a8f16d..0820b3c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-28.1
\ No newline at end of file
+29.0
\ No newline at end of file

From cacbf6ad040288425e2c0ecdb3b81e47c2a63526 Mon Sep 17 00:00:00 2001
From: Oscar Fawkes <oscar@ocf.sh>
Date: Sun, 8 Jun 2025 12:35:36 +1000
Subject: [PATCH 2/2] reduce mem use, remove ctest

---
 Dockerfile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f78dda9..6c65463 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,10 +37,8 @@ RUN export CONFIG_SITE=/bitcoin/depends/$(/bitcoin/depends/config.guess)/share/c
     cmake -B build \
         -DENABLE_WALLET=OFF \
         --toolchain depends/$(/bitcoin/depends/config.guess)/toolchain.cmake \
-        -DCMAKE_CXX_FLAGS="-O0 -g0 --static -static -fPIC"; \
-    cmake --build build \
-        -j$($(nproc)+1); \
-    ctest --test-dir build; \
+        -DCMAKE_CXX_FLAGS="-O0 -g0 -static -fPIC"; \
+    cmake --build build; \
     cmake --install build;
 
 FROM alpine:latest