From 313693f50b9dc24624901d20ee059a5bdde07d97 Mon Sep 17 00:00:00 2001 From: charlesgauthereau Date: Wed, 28 Jan 2026 21:20:53 +0100 Subject: [PATCH] chore(release): 1.0.4-rc.7 --- CITATION.cff | 2 +- Cargo.lock | 2 +- Cargo.toml | 2 +- docker/Dockerfile | 34 ++++------------------------------ 4 files changed, 7 insertions(+), 33 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 9133e22..2057498 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -22,5 +22,5 @@ keywords: - self-hosted - portabase license: Apache-2.0 -version: 1.0.4-rc.6 +version: 1.0.4-rc.7 date-released: "2026-01-28" \ No newline at end of file diff --git a/Cargo.lock b/Cargo.lock index 7624c12..316bf10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1595,7 +1595,7 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "portabase-agent" -version = "1.0.4-rc.5" +version = "1.0.4-rc.6" dependencies = [ "anyhow", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index 47464c6..8ed8770 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "portabase-agent" -version = "1.0.4-rc.6" +version = "1.0.4-rc.7" edition = "2024" [dependencies] diff --git a/docker/Dockerfile b/docker/Dockerfile index c52031e..cd410dc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -255,7 +255,6 @@ FROM rust:1.92.0 AS base ARG TARGETARCH ARG BUILDPLATFORM -# Paquets communs RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ pkg-config \ libssl-dev \ @@ -268,45 +267,21 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ zlib1g \ curl \ mariadb-client \ + qemu-user-static \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* -# ========================= -# PostgreSQL client binaries -# ========================= -RUN for v in 12 13 14 15 16 17 18; do mkdir -p /usr/lib/postgresql/$v/bin; done -COPY assets/tools/amd64/postgresql/ /tmp/pg-x64/ -COPY assets/tools/arm64/postgresql/ /tmp/pg-arm/ - -RUN if [ "$TARGETARCH" = "amd64" ]; then \ - for v in 12 13 14 15 16 17 18; do \ - cp -r /tmp/pg-x64/postgresql-$v/bin/* /usr/lib/postgresql/$v/bin/; \ - done; \ - else \ - for v in 12 13 14 15 16 17 18; do \ - cp -r /tmp/pg-arm/postgresql-$v/bin/* /usr/lib/postgresql/$v/bin/; \ - done; \ - fi && rm -rf /tmp/pg-x64 /tmp/pg-arm && chmod +x /usr/lib/postgresql/*/bin/* - -# ========================= -# MongoDB client binaries -# ========================= -COPY assets/tools/${TARGETARCH}/mongodb/ /usr/local/mongodb/ -RUN chmod +x /usr/local/mongodb/bin/* - WORKDIR /app # ========================= -# Builder (production) +# Builder pour cross-compilation # ========================= FROM base AS builder ARG TARGETARCH -# Ajouter cibles Rust -RUN rustup target add x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu +RUN rustup target add aarch64-unknown-linux-gnu -# Installer toolchain cross-compilation ARM si nécessaire RUN if [ "$TARGETARCH" = "arm64" ]; then \ dpkg --add-architecture arm64 && \ apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ @@ -316,7 +291,6 @@ RUN if [ "$TARGETARCH" = "arm64" ]; then \ && rm -rf /var/lib/apt/lists/*; \ fi -# Config OpenSSL pour cross compilation ENV CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc ENV OPENSSL_DIR=/usr @@ -325,7 +299,6 @@ ENV OPENSSL_INCLUDE_DIR=/usr/include/aarch64-linux-gnu COPY . . -# Build selon l'architecture RUN if [ "$TARGETARCH" = "amd64" ]; then \ cargo build --release --target x86_64-unknown-linux-gnu && \ mv /app/target/x86_64-unknown-linux-gnu/release /app/target/release-app; \ @@ -334,6 +307,7 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \ mv /app/target/aarch64-unknown-linux-gnu/release /app/target/release-app; \ fi +# Enregistrer version RUN echo "APP_VERSION=$(cargo pkgid | awk -F# '{print $2}')" > /app/version.env # =========================