Merge pull request #52 from dappnode/hector/fix-issues

Add ARM support, fix P2P en var in entrypoint

Author: hcastc00

.gitignore

@@ -1 +1,3 @@
-build/
+# DAppNodeSDK release directories
+build_*
+docker-compose-tmp.yml

dappnode_package.json

@@ -7,15 +7,24 @@
   "shortDescription": "Support the Bitcoin network, run your own node",
   "description": "The Bitcoin Core daemon. Bitcoind is a program that implements the Bitcoin protocol for remote procedure call (RPC) use.",
   "type": "service",
+  "architectures": [
+    "linux/amd64",
+    "linux/arm64"
+  ],
   "chain": "bitcoin",
   "author": "DAppNode Association <admin@dappnode.io> (https://github.com/dappnode)",
   "contributors": [
     "Abel Boldú (@vdo)",
     "Eduardo Antuña <eduadiez@gmail.com> (https://github.com/eduadiez)",
     "Loco del Bitcoin <ellocodelbitcoin@gmail.com>"
   ],
-  "categories": ["Blockchain"],
-  "keywords": ["bitcoin", "btc"],
+  "categories": [
+    "Blockchain"
+  ],
+  "keywords": [
+    "bitcoin",
+    "btc"
+  ],
   "links": {
     "homepage": "https://github.com/dappnode/DAppNodePackage-bitcoin#readme",
     "endpoint": "http://bitcoin.dappnode:8332"
@@ -28,4 +37,4 @@
     "url": "https://github.com/dappnode/DAppNodePackage-bitcoin/issues"
   },
   "license": "GPL-3.0"
-}
+}

releases.json

@@ -6,5 +6,11 @@
       "dappnode": "Mon, 25 Nov 2019 16:12:52 GMT"
     },
     "link": "http://my.dappnode/#/sdk/publish/r=bitcoin.dnp.dappnode.eth&v=0.1.5&h=%2Fipfs%2FQmWzNqeGK7BZ2L3J5yeA6FmTPscuub2qYiWKoQo4ia8ZVJ"
+  },
+  "0.1.10": {
+    "hash": "/ipfs/QmSfeBp7tL8MH3vrPkfj7T5EkS7xm8DimU5cgVAqL8wCh9",
+    "uploadedTo": {
+      "dappnode": "Thu, 14 Aug 2025 10:32:51 GMT"
+    }
   }
-}
+}

src/Dockerfile

@@ -6,23 +6,28 @@ FROM debian:bullseye-slim as binary
 # To fix this incongruation it is removed the first char from the env UPSTREA_VERSION to download the binary and
 # keep the CI in github to bumpo the version with the sdk bot
 
-ARG UPSTREAM_VERSION
 
 RUN apt-get update && apt-get install curl -y
 
-RUN curl https://bitcoincore.org/bin/bitcoin-core-${UPSTREAM_VERSION}/bitcoin-${UPSTREAM_VERSION}-x86_64-linux-gnu.tar.gz -o bitcoin-${UPSTREAM_VERSION}-x86_64-linux-gnu.tar.gz
-
-RUN expected_256checksum=$(curl https://bitcoincore.org/bin/bitcoin-core-${UPSTREAM_VERSION}/SHA256SUMS | grep bitcoin-${UPSTREAM_VERSION}-x86_64-linux-gnu.tar.gz | awk '{print $1}')  \
-  && if [ sha256sum /bitcoin-${UPSTREAM_VERSION}-x86_64-linux-gnu.tar.gz | awk '{print $1}'  != "$expected_256checksum" ]; then \
-  tar xzvf /bitcoin-${UPSTREAM_VERSION}-x86_64-linux-gnu.tar.gz; \
-  mv /bitcoin-${UPSTREAM_VERSION} /bitcoin; \
-  echo "Checksum verification failed."; \
-  else \
-  tar xzvf /bitcoin-${UPSTREAM_VERSION}-x86_64-linux-gnu.tar.gz; \
-  mv /bitcoin-${UPSTREAM_VERSION} /bitcoin; \
-  fi
-
-
+ARG UPSTREAM_VERSION
+ARG TARGETARCH
+# map Docker arch to Core tarball arch names + verify checksum and extract
+RUN set -eux; \
+  VERSION_NO_V="${UPSTREAM_VERSION#v}"; \
+  case "$TARGETARCH" in \
+  amd64)  CORE_ARCH="x86_64" ;; \
+  arm64)  CORE_ARCH="aarch64" ;; \
+  *) echo "Unsupported arch: $TARGETARCH" >&2; exit 1 ;; \
+  esac; \
+  BASE_URL="https://bitcoincore.org/bin/bitcoin-core-${VERSION_NO_V}"; \
+  TARBALL="bitcoin-${VERSION_NO_V}-${CORE_ARCH}-linux-gnu.tar.gz"; \
+  curl -fsSL "${BASE_URL}/${TARBALL}" -o /tmp/bitcoin.tar.gz; \
+  curl -fsSL "${BASE_URL}/SHA256SUMS" -o /tmp/SHA256SUMS; \
+  EXPECTED="$(grep " ${TARBALL}\$" /tmp/SHA256SUMS | awk '{print $1}')"; \
+  ACTUAL="$(sha256sum /tmp/bitcoin.tar.gz | awk '{print $1}')"; \
+  test -n "$EXPECTED"; \
+  [ "$EXPECTED" = "$ACTUAL" ] || { echo "SHA256 mismatch: expected=$EXPECTED actual=$ACTUAL" >&2; exit 1; }; \
+  mkdir -p /bitcoin && tar -xzf /tmp/bitcoin.tar.gz -C /bitcoin --strip-components=1
 
 FROM debian:bullseye-slim AS final
 
@@ -33,4 +38,4 @@ COPY --from=binary /bitcoin/bin/bitcoind /usr/local/bin/
 ADD ./docker_entrypoint.sh /usr/local/bin/docker_entrypoint.sh
 RUN chmod a+x /usr/local/bin/docker_entrypoint.sh
 
-ENTRYPOINT ["/usr/local/bin/docker_entrypoint.sh"]
+ENTRYPOINT ["/usr/local/bin/docker_entrypoint.sh"]

src/docker_entrypoint.sh

@@ -64,7 +64,7 @@ EOF
 #fi
 
 if [ $# -eq 0 ]; then
-    exec bitcoind -datadir=${BITCOIN_DIR} -conf=${BITCOIN_CONF} -port={P2P_PORT}
+    exec bitcoind -datadir=${BITCOIN_DIR} -conf=${BITCOIN_CONF} -port=${P2P_PORT:-8333}
 else
     exec "$@"
 fi