Merge pull request #3 from alegeay/dev

Dev

Author: alegeay

Dockerfile

@@ -1,35 +1,47 @@
-# Étape 1 : Compilation avec nightly + build-std
+# Étape 1 : Compilation
 FROM rust:1.83-alpine AS builder
 
+ARG TARGETARCH
+
 RUN apk add --no-cache musl-dev upx
 
-# Installer nightly et rust-src
-RUN rustup toolchain install nightly \
-    && rustup component add rust-src --toolchain nightly
+# Déterminer la target en fonction de l'architecture
+# Si TARGETARCH n'est pas défini (legacy builder), on détecte l'arch native
+RUN if [ -z "$TARGETARCH" ]; then \
+        case "$(uname -m)" in \
+            x86_64) TARGETARCH=amd64 ;; \
+            aarch64) TARGETARCH=arm64 ;; \
+        esac; \
+    fi && \
+    case "$TARGETARCH" in \
+        amd64) echo "x86_64-unknown-linux-musl" > /tmp/rust_target ;; \
+        arm64) echo "aarch64-unknown-linux-musl" > /tmp/rust_target ;; \
+        *) echo "Unsupported arch: $TARGETARCH" && exit 1 ;; \
+    esac && \
+    rustup target add $(cat /tmp/rust_target)
 
 WORKDIR /app
 
 # Cache des dépendances
 COPY Cargo.toml Cargo.lock* ./
-RUN mkdir src && echo "fn main() {}" > src/main.rs \
-    && RUSTFLAGS="-Zunstable-options -Cpanic=abort" cargo +nightly build --release \
-       -Z build-std=std,panic_abort \
-       --target x86_64-unknown-linux-musl \
+RUN RUST_TARGET=$(cat /tmp/rust_target) \
+    && mkdir src && echo "fn main() {}" > src/main.rs \
+    && cargo build --release --target $RUST_TARGET \
     && rm -rf src
 
-# Compilation du binaire avec build-std
+# Compilation du binaire
 COPY src ./src
-RUN touch src/main.rs \
-    && RUSTFLAGS="-Zunstable-options -Cpanic=abort" cargo +nightly build --release \
-       -Z build-std=std,panic_abort \
-       --target x86_64-unknown-linux-musl \
-    && strip target/x86_64-unknown-linux-musl/release/naolametric \
-    && upx --best --lzma target/x86_64-unknown-linux-musl/release/naolametric
+RUN RUST_TARGET=$(cat /tmp/rust_target) \
+    && touch src/main.rs \
+    && cargo build --release --target $RUST_TARGET \
+    && strip target/$RUST_TARGET/release/naolametric \
+    && upx --best --lzma target/$RUST_TARGET/release/naolametric \
+    && cp target/$RUST_TARGET/release/naolametric /naolametric-bin
 
 # Étape 2 : Image scratch
 FROM scratch
 
-COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/naolametric /naolametric
+COPY --from=builder /naolametric-bin /naolametric
 
 ENV PORT=8080
 EXPOSE 8080