Merge branch 'main' into dependabot/github_actions/docker/build-push-action-6.18.0

Author: benjaminskiljan

docker-compose-testnet.yml

@@ -1,7 +1,7 @@
 services:
   bitcoin:
     container_name: bitcoin
-    image: flarefoundation/bitcoin:29.0
+    image: flarefoundation/bitcoin:29.1
     restart: on-failure:3
     environment:
       - TZ=Europe/London
@@ -40,7 +40,7 @@ services:
 
   rippled:
     container_name: rippled
-    image: flarefoundation/rippled:2.5.0
+    image: flarefoundation/rippled:2.6.0
     restart: on-failure:3
     environment:
       - TZ=Europe/London
@@ -58,7 +58,7 @@ services:
 
   algorand:
     container_name: algorand
-    image: flarefoundation/algorand:4.1.2
+    image: flarefoundation/algorand:4.2.1
     restart: on-failure:3
     ports:
       - ${BIND_IP}:18080:8080

docker-compose.yml

@@ -1,7 +1,7 @@
 services:
   bitcoin:
     container_name: bitcoin
-    image: flarefoundation/bitcoin:29.0
+    image: flarefoundation/bitcoin:29.1
     restart: on-failure:3
     environment:
       - TZ=Europe/London
@@ -37,7 +37,7 @@ services:
 
   rippled:
     container_name: rippled
-    image: flarefoundation/rippled:2.5.0
+    image: flarefoundation/rippled:2.6.0
     restart: on-failure:3
     environment:
       - TZ=Europe/London
@@ -55,7 +55,7 @@ services:
 
   algorand:
     container_name: algorand
-    image: flarefoundation/algorand:4.1.2
+    image: flarefoundation/algorand:4.2.1
     restart: on-failure:3
     ports:
       - ${BIND_IP}:6332:8080

images/algorand/Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.3-labs
 FROM debian:12@sha256:b6507e340c43553136f5078284c8c68d86ec8262b1724dde73c325e8d3dcdeba as build
 
-ARG ALGORAND_VERSION=v4.1.2-stable
+ARG ALGORAND_VERSION=v4.2.1-stable
 ARG GO_VERSION=1.23.9
 
 WORKDIR /opt/algorand

images/algorand/build.sh

@@ -1 +1 @@
-docker build -t flarefoundation/algorand:4.1.2 .
+docker build -t flarefoundation/algorand:4.2.1 .

images/bitcoind/Dockerfile

@@ -1,25 +1,27 @@
 # syntax=docker/dockerfile:1.3-labs
 FROM debian:12@sha256:b6507e340c43553136f5078284c8c68d86ec8262b1724dde73c325e8d3dcdeba as build
 
-ARG VERSION=v29.0
+ARG VERSION=v29.1
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London"
 
 # https://github.com/bitcoin/bitcoin/blob/master/doc/build-unix.md#linux-distribution-specific-instructions
 RUN <<-EOF
+    set -e
     apt-get -y update && \
     apt-get -y install \
-    git \
-    build-essential \
-    cmake \
-    curl
+        git \
+        build-essential \
+        cmake \
+        curl
 EOF
 
 RUN git clone --single-branch --branch "${VERSION}" https://github.com/bitcoin/bitcoin.git /opt/bitcoin
 
 WORKDIR /opt/bitcoin
 
 RUN <<-EOF
+    set -e
     make -C depends/ -j $(getconf _NPROCESSORS_ONLN) NO_QT=1 NO_QR=1 NO_WALLET=1
     cmake -B build \
         --toolchain /opt/bitcoin/depends/x86_64-pc-linux-gnu/toolchain.cmake \
@@ -29,15 +31,14 @@ RUN <<-EOF
     find /opt/bitcoin/build/bin -type f -executable -exec strip -s {} + 2>/dev/null || true
 EOF
 
-RUN mkdir -p /opt/bitcoin/.bitcoin/db && \
-    chown -R 65532:65532 /opt/bitcoin/
+RUN mkdir -p /opt/bitcoin/.bitcoin/db
 
 FROM gcr.io/distroless/cc-debian12:nonroot@sha256:d1b8e4c52be1111aa108e959ef2a822299bb70fd1819dd250871a2601ca1e4b6 as final
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London"
 
-COPY --from=build /opt/bitcoin/build/bin /opt/bitcoin/bin
-COPY --from=build /opt/bitcoin/.bitcoin/db /opt/bitcoin/.bitcoin/db
-COPY bitcoin.conf /opt/bitcoin/.bitcoin/bitcoin.conf
+COPY --from=build --chown=65532:65532 /opt/bitcoin/build/bin /opt/bitcoin/bin
+COPY --from=build --chown=65532:65532 /opt/bitcoin/.bitcoin/db /opt/bitcoin/.bitcoin/db
+COPY --chown=65532:65532 bitcoin.conf /opt/bitcoin/.bitcoin/bitcoin.conf
 
 ENTRYPOINT ["/opt/bitcoin/bin/bitcoind", "-conf=/opt/bitcoin/.bitcoin/bitcoin.conf", "-datadir=/opt/bitcoin/.bitcoin/db", "-txindex=1"]

images/bitcoind/build.sh

@@ -1 +1 @@
-docker build -t flarefoundation/bitcoin:29.0 .
+docker build -t flarefoundation/bitcoin:29.1 .

images/rippled/Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.3-labs
-FROM debian:12@sha256:b6507e340c43553136f5078284c8c68d86ec8262b1724dde73c325e8d3dcdeba as build
+FROM debian:12@sha256:731dd1380d6a8d170a695dbeb17fe0eade0e1c29f654cf0a3a07f372191c3f4b as build
 
-ARG VERSION=2.5.0
+ARG VERSION=2.6.0
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London"
 
@@ -32,16 +32,11 @@ WORKDIR /opt/ripple
 
 ENV PATH="/opt/conan_env/bin:$PATH"
 
-# New and improved build process, but is not in latest (2.5.0) release yet
-# Move from copying the default profile to using one in 
-# "/opt/ripple/conan/profiles/default" after it gets integrated
 # https://github.com/XRPLF/rippled/blob/develop/BUILD.md
-COPY conan_default conan_default
-
 RUN <<-EOF
     set -e
     git config --global http.postBuffer 1048576000
-    conan config install conan_default -tf $(conan config home)/profiles 
+    conan config install /opt/ripple/conan/profiles/default -tf $(conan config home)/profiles 
     conan remote add --index 0 xrplf "https://conan.ripplex.io"
     mkdir cmake_build
 EOF
@@ -51,8 +46,8 @@ RUN <<-EOF
     cd cmake_build
     conan install \
         .. \
-        --profile:host=conan_default \
-        --profile:build=conan_default \
+        --profile:host=default \
+        --profile:build=default \
         --output-folder . \
         --build missing \
         --settings build_type=Release
@@ -81,7 +76,7 @@ EOF
 
 COPY rippled.conf validators.txt /opt/ripple/.ripple/
 
-FROM gcr.io/distroless/base-debian12:nonroot@sha256:dca858878977f01b80685240ca2cd9c1bb38958e2ab6f4ed5698c0ea23307143 as final
+FROM gcr.io/distroless/base-debian12:nonroot@sha256:c1201b805d3a35a4e870f9ce9775982dd166a2b0772232638dd2440fbe0e0134 as final
 
 ENV DEBIAN_FRONTEND="noninteractive" TZ="Europe/London"
 

images/rippled/build.sh

@@ -1 +1 @@
-docker build -t flarefoundation/rippled:2.5.0 .
+docker build -t flarefoundation/rippled:2.6.0-dless .