Skip to content

Commit

Permalink
fix: ARM (Apple Silicon) build support in Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
catch-21 committed Jan 13, 2025
1 parent f306f33 commit 5bbd402
Showing 1 changed file with 23 additions and 4 deletions.
27 changes: 23 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
# ========================
FROM rust:1.82.0-alpine3.20 AS builder

# Build platform argument (x86_64 or aarch64) (default: x86_64)
ARG TARGETARCH=x86_64

# Log TARGETARCH
RUN echo "TARGETARCH: $TARGETARCH"

# Install build dependencies, including static OpenSSL libraries
RUN apk add --no-cache \
musl-dev \
Expand All @@ -12,13 +18,24 @@ RUN apk add --no-cache \
build-base \
curl

# Install cross-compiler toolchain only for ARM (Apple Silicon)
RUN if [ "$TARGETARCH" = "aarch64" ]; then \
wget -qO- https://musl.cc/aarch64-linux-musl-cross.tgz | tar -xz -C /usr/local && \
echo "/usr/local/aarch64-linux-musl-cross/bin" > /tmp/musl_cross_path; \
else \
echo "" > /tmp/musl_cross_path; \
fi

# Set PATH only if we installed the cross compiler (will be empty string for x86)
ENV PATH="$(cat /tmp/musl_cross_path):$PATH"

# Set environment variables for static linking with OpenSSL
ENV OPENSSL_STATIC=yes
ENV OPENSSL_LIB_DIR=/usr/lib
ENV OPENSSL_INCLUDE_DIR=/usr/include

# Add the MUSL target for static linking
RUN rustup target add x86_64-unknown-linux-musl
RUN rustup target add $TARGETARCH-unknown-linux-musl

# Set the working directory
WORKDIR /usr/src/app
Expand All @@ -30,21 +47,23 @@ COPY Cargo.toml Cargo.lock ./
COPY . .

# Build the project in release mode for the MUSL target
RUN cargo build --release --bin pubky-homeserver --target x86_64-unknown-linux-musl
RUN cargo build --release --bin pubky-homeserver --target $TARGETARCH-unknown-linux-musl

# Strip the binary to reduce size
RUN strip target/x86_64-unknown-linux-musl/release/pubky-homeserver
RUN strip target/$TARGETARCH-unknown-linux-musl/release/pubky-homeserver

# ========================
# Runtime Stage
# ========================
FROM alpine:3.20

ARG TARGETARCH=x86_64

# Install runtime dependencies (only ca-certificates)
RUN apk add --no-cache ca-certificates

# Copy the compiled binary from the builder stage
COPY --from=builder /usr/src/app/target/x86_64-unknown-linux-musl/release/pubky-homeserver /usr/local/bin/homeserver
COPY --from=builder /usr/src/app/target/$TARGETARCH-unknown-linux-musl/release/pubky-homeserver /usr/local/bin/homeserver

# Set the working directory
WORKDIR /usr/local/bin
Expand Down

0 comments on commit 5bbd402

Please sign in to comment.