Merge pull request #329 from chengzhinei/main

feat: malachitebft dockerfile support arm docker

Author: nora-coder-dot

.github/release/cl.Dockerfile

@@ -1,24 +1,33 @@
 # Use Rust Nightly version base image
-FROM rustlang/rust:nightly
+#FROM rustlang/rust:nightly
+FROM --platform=$BUILDPLATFORM rustlang/rust:nightly AS builder
 
 # Set working directory
 WORKDIR /app
 
 # Install necessary dependencies, including protoc
 RUN apt-get update && apt-get install -y \
     protobuf-compiler \
+    gcc-aarch64-linux-gnu \
+    libc6-dev-arm64-cross \
     && rm -rf /var/lib/apt/lists/*
 
 # Clone project code
 RUN git clone https://github.com/MetisProtocol/malaketh-layered.git .
 
+RUN rustup target add aarch64-unknown-linux-gnu
+
+ARG TARGETARCH
+
 # Build the project
-RUN cargo build --release
+RUN if [ "$TARGETARCH" = "arm64" ]; then \
+        export CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc; \
+        cargo build --release --target aarch64-unknown-linux-gnu; \
+    else \
+        cargo build --release; \
+    fi
 
 # Copy the generated binary to a new lightweight image
-#FROM debian:bullseye-slim
-#FROM debian:bookworm-slim
-#FROM ubuntu:22.04
 FROM ubuntu:24.04
 
 # Install necessary dependencies
@@ -30,11 +39,18 @@ RUN apt-get update && apt-get install -y \
 # Set working directory
 WORKDIR /app
 
-# Copy the generated binary from the previous build image
-COPY --from=0 /app/target/release/malachitebft-eth-app /app/
-#COPY --from=0 /app/target/release/malachitebft-eth-cli /app/
-#COPY --from=0 /app/target/release/malachitebft-eth-engine /app/
-COPY --from=0 /app/target/release/malachitebft-eth-utils /app/
+ARG TARGETARCH
+
+RUN if [ "$TARGETARCH" = "arm64" ]; then \
+        echo "aarch64-unknown-linux-gnu/" > /target-subdir.txt; \
+    else \
+        echo "" > /target-subdir.txt; \
+    fi
+
+RUN --mount=from=builder,source=/app/target,target=/builder-target \
+    TARGET_SUBDIR=$(cat /target-subdir.txt) && \
+    cp /builder-target/${TARGET_SUBDIR}release/malachitebft-eth-app /app/
+
 
 # Set environment variables
 ENV PATH="/app:${PATH}"
@@ -44,4 +60,3 @@ EXPOSE 8545 8551 9090 3000
 
 # Run the application (assuming you want to run malachitebft-eth-app here)
 CMD ["malachitebft-eth-app"]
-

.github/workflows/image.yaml

@@ -88,6 +88,6 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
           file: .github/release/cl.Dockerfile
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}