Support multi-arch

build/Dockerfile

@@ -1,16 +1,19 @@
+# Build Geth in a stock Go builder container
+FROM golang:1.14-alpine as builder
+
 ARG UPSTREAM_VERSION
-FROM ethereum/client-go:${UPSTREAM_VERSION} as geth
 
-# Pull Parity into a second stage deploy alpine container
+RUN apk add --no-cache make gcc musl-dev linux-headers git && \
+    git clone -b ${UPSTREAM_VERSION} https://github.com/ethereum/go-ethereum.git && \
+    cd go-ethereum && make geth
+
+
 FROM alpine:edge
 
 RUN apk --no-cache add \
-    libstdc++ \ 
-    eudev-libs \
-    libgcc \
-    bash
+    libstdc++ eudev-libs libgcc bash
 
-COPY --from=geth /usr/local/bin/geth /usr/local/bin/geth
+COPY --from=builder /go/go-ethereum/build/bin/geth /usr/local/bin
 
 ENV SYNCMODE fast
 ENTRYPOINT geth --rpc --rpcaddr 0.0.0.0 --rpccorsdomain "*" --rpcvhosts "*" --ws --wsorigins "*" --wsaddr 0.0.0.0 --syncmode ${SYNCMODE:-fast} --nousb $EXTRA_OPTS

dappnode_package.json

@@ -5,6 +5,7 @@
   "shortDescription": "Geth is the official Go implementation of the Ethereum protocol.",
   "description": "Ethereum is a global, open-source platform for decentralized applications where you can write code that controls digital value, runs exactly as programmed, and is accessible anywhere in the world.",
   "type": "library",
+  "architectures": ["linux/amd64", "linux/arm64"],
   "chain": "ethereum",
   "author": "DAppNode Association <[email protected]> (https://github.com/dappnode)",
   "contributors": [

docker-compose.yml

@@ -5,7 +5,7 @@ services:
     build:
       context: ./build
       args:
-        - UPSTREAM_VERSION
+        - UPSTREAM_VERSION=v1.9.21
     volumes:
       - 'geth:/root/.ethereum'
     environment: