chore: docker fixes (#2)

* docker fixes

* bump rust version in docker

* more fixes

* more fixes

* attempt

* ci: fix remote cross compilation (#4)

* only create images on push to main

---------

Co-authored-by: auricom <27022259+auricom@users.noreply.github.com>

Author: tac0turtle

.dockerignore

@@ -0,0 +1,55 @@
+# Rust build artifacts
+target/
+**/*.rs.bk
+*.pdb
+
+# Git
+.git/
+.gitignore
+
+# IDE
+.idea/
+.vscode/
+*.swp
+*.swo
+*~
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Documentation
+*.md
+!README.md
+!LICENSE-*
+
+# Development files
+.env
+.env.local
+.env.*.local
+
+# Test artifacts
+tarpaulin-report.html
+cobertura.xml
+
+# Temporary files
+tmp/
+temp/
+*.tmp
+*.temp
+
+# Docker
+.dockerignore
+Dockerfile*
+docker-compose*.yml
+
+# CI/CD
+.github/
+.gitlab-ci.yml
+.travis.yml
+
+# Benchmarks and profiling
+benches/
+perf.data
+perf.data.old
+flamegraph.svg

.github/workflows/docker.yml

@@ -5,6 +5,8 @@ name: docker
 on:
   workflow_dispatch: {}
   push:
+    branches:
+      - main
     tags:
       - v*
 
@@ -24,6 +26,18 @@ jobs:
       contents: read
     steps:
       - uses: actions/checkout@v4
+      - name: Install build dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            build-essential \
+            pkg-config \
+            libssl-dev \
+            libclang-dev \
+            clang \
+            llvm-dev \
+            gcc-multilib \
+            g++-multilib
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@v2
         with:
@@ -37,4 +51,14 @@ jobs:
           docker run --privileged --rm tonistiigi/binfmt --install arm64,amd64
           docker buildx create --use --name cross-builder
       - name: Build and push image
-        run: make docker-build-push
+        run: |
+          export LIBCLANG_PATH=/usr/lib/llvm-18/lib
+          export BINDGEN_EXTRA_CLANG_ARGS="-I/usr/include"
+          export CC_x86_64_unknown_linux_gnu=x86_64-linux-gnu-gcc
+          export CXX_x86_64_unknown_linux_gnu=x86_64-linux-gnu-g++
+          export AR_x86_64_unknown_linux_gnu=x86_64-linux-gnu-ar
+          export CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc
+          export CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++
+          export AR_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ar
+          export PKG_CONFIG_ALLOW_CROSS=1
+          make docker-build-push

Cargo.toml

@@ -205,3 +205,12 @@ too_long_first_doc_paragraph = "allow"
 opt-level = 3
 lto = "thin"
 strip = "debuginfo"
+codegen-units = 1
+
+# Memory-optimized release profile
+[profile.docker]
+inherits = "release"
+opt-level = 2
+lto = false
+codegen-units = 1
+incremental = false

Cross.toml

@@ -0,0 +1,14 @@
+[build]
+# Custom Docker images with proper build environment for native dependencies
+
+[target.x86_64-unknown-linux-gnu]
+dockerfile = "Dockerfile.cross-x86_64"
+
+[target.aarch64-unknown-linux-gnu]
+dockerfile = "Dockerfile.cross-aarch64"
+
+[build.env]
+passthrough = [
+    "RUST_LOG",
+    "CARGO_TERM_COLOR",
+]

Dockerfile

@@ -1,32 +1,73 @@
-# syntax=docker/dockerfile:1
+FROM lukemathwalker/cargo-chef:latest-rust-1 AS chef
+WORKDIR /app
 
-# Build stage
-FROM rust:1.81-slim AS builder
+LABEL org.opencontainers.image.licenses="MIT OR Apache-2.0"
 
-# Install build dependencies
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && \
+    apt-get -y upgrade && \
+    apt-get install -y \
+    build-essential \
     pkg-config \
     libssl-dev \
-    && rm -rf /var/lib/apt/lists/*
+    clang-14 \
+    libclang-14-dev \
+    llvm-14-dev \
+    libc6-dev \
+    && ln -sf /usr/lib/llvm-14/lib/libclang.so /usr/lib/libclang.so
 
-WORKDIR /app
+FROM chef AS planner
+COPY . .
+RUN cargo chef prepare --recipe-path recipe.json
+
+FROM chef AS builder
+COPY --from=planner /app/recipe.json recipe.json
 
-# Copy manifests
+# Copy workspace Cargo files for better caching
 COPY Cargo.toml Cargo.lock ./
-COPY bin/ bin/
-COPY crates/ crates/
+COPY bin/lumen/Cargo.toml bin/lumen/
+COPY crates/common/Cargo.toml crates/common/
+COPY crates/node/Cargo.toml crates/node/
+COPY crates/rollkit/Cargo.toml crates/rollkit/
+COPY crates/tests/Cargo.toml crates/tests/
+
+ARG BUILD_PROFILE=docker
+ENV BUILD_PROFILE=$BUILD_PROFILE
+
+# Set memory-efficient build flags
+ARG RUSTFLAGS="-C codegen-units=1"
+ENV RUSTFLAGS="$RUSTFLAGS"
+ENV CARGO_BUILD_JOBS=2
+ENV CARGO_INCREMENTAL=0
+
+# Cook dependencies first (better layer caching)
+RUN cargo chef cook --profile $BUILD_PROFILE --recipe-path recipe.json --manifest-path bin/lumen/Cargo.toml
 
-# Build the application
-RUN cargo build --release --bin lumen
+# Copy all source code
+COPY . .
 
-# Runtime stage
-FROM gcr.io/distroless/cc-debian12
+# Build the binary with memory-efficient settings
+RUN cargo build --profile $BUILD_PROFILE --bin lumen --manifest-path bin/lumen/Cargo.toml -j 2
+
+# Copy binary from correct location
+RUN ls -la /app/target/$BUILD_PROFILE/lumen
+RUN cp /app/target/$BUILD_PROFILE/lumen /lumen
+
+FROM ubuntu:22.04 AS runtime
+
+RUN apt-get update && \
+    apt-get install -y ca-certificates libssl-dev pkg-config strace && \
+    rm -rf /var/lib/apt/lists/*
+
+WORKDIR /app
+COPY --from=builder /lumen /usr/local/bin/
+RUN chmod +x /usr/local/bin/lumen
+COPY LICENSE-* ./
 
-# Copy the binary from builder
-COPY --from=builder /app/target/release/lumen /usr/local/bin/lumen
+# Expose ports: P2P, Discovery, Metrics, JSON-RPC, WebSocket, GraphQL, Engine API
+EXPOSE 30303 30303/udp 9001 8545 8546 7545 8551
 
-# Expose default ports
-EXPOSE 8545 8546 30303 6060 9001
+# Add health check
+HEALTHCHECK --interval=30s --timeout=3s --start-period=40s --retries=3 \
+    CMD /usr/local/bin/lumen --version || exit 1
 
-# Set the entrypoint
-ENTRYPOINT ["/usr/local/bin/lumen"]
+ENTRYPOINT ["/usr/local/bin/lumen"]

Dockerfile.cross-aarch64

@@ -0,0 +1,27 @@
+FROM ghcr.io/cross-rs/cross:main
+
+# Install ARM64 cross-compilation toolchain
+RUN apt-get update && \
+    apt-get install -y \
+        gcc-aarch64-linux-gnu \
+        g++-aarch64-linux-gnu \
+        libc6-dev-arm64-cross \
+        pkg-config-aarch64-linux-gnu \
+        build-essential \
+        clang \
+        libclang-dev && \
+    rm -rf /var/lib/apt/lists/*
+
+# Set up environment variables for ARM64 cross-compilation
+# Keep host compiler for build scripts, only set target-specific variables
+ENV CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc
+ENV CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++
+ENV AR_aarch64_unknown_linux_gnu=aarch64-linux-gnu-ar
+ENV STRIP_aarch64_unknown_linux_gnu=aarch64-linux-gnu-strip
+ENV PKG_CONFIG_aarch64_unknown_linux_gnu=aarch64-linux-gnu-pkg-config
+ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
+ENV BINDGEN_EXTRA_CLANG_ARGS="-I/usr/aarch64-linux-gnu/include -I/usr/include"
+ENV CFLAGS_aarch64_unknown_linux_gnu="-I/usr/aarch64-linux-gnu/include -I/usr/include"
+ENV CPPFLAGS_aarch64_unknown_linux_gnu="-I/usr/aarch64-linux-gnu/include -I/usr/include"
+ENV JEMALLOC_SYS_WITH_LG_PAGE=16
+ENV PKG_CONFIG_ALLOW_CROSS=1

Dockerfile.cross-x86_64

@@ -0,0 +1,19 @@
+FROM ghcr.io/cross-rs/cross:main
+
+# Install additional build tools and headers
+RUN apt-get update && \
+    apt-get install -y \
+        build-essential \
+        pkg-config \
+        libclang-dev \
+        clang && \
+    rm -rf /var/lib/apt/lists/*
+
+# Set up environment variables for x86_64 cross-compilation
+ENV CC_x86_64_unknown_linux_gnu=x86_64-linux-gnu-gcc
+ENV CXX_x86_64_unknown_linux_gnu=x86_64-linux-gnu-g++
+ENV AR_x86_64_unknown_linux_gnu=x86_64-linux-gnu-ar
+ENV STRIP_x86_64_unknown_linux_gnu=x86_64-linux-gnu-strip
+ENV BINDGEN_EXTRA_CLANG_ARGS_x86_64_unknown_linux_gnu="-I/usr/include -I/usr/include/x86_64-linux-gnu"
+ENV CFLAGS_x86_64_unknown_linux_gnu="-I/usr/include -I/usr/include/x86_64-linux-gnu"
+ENV CPPFLAGS_x86_64_unknown_linux_gnu="-I/usr/include -I/usr/include/x86_64-linux-gnu"