chore(release): 1.0.4-rc.5

CITATION.cff

@@ -22,5 +22,5 @@ keywords:
   - self-hosted
   - portabase
 license: Apache-2.0
-version: 1.0.3
+version: 1.0.4-rc.5
 date-released: "2026-01-28"

Cargo.lock

@@ -1595,7 +1595,7 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "portabase-agent"
-version = "1.0.3-rc.16"
+version = "1.0.4-rc.4"
 dependencies = [
  "anyhow",
  "async-trait",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "portabase-agent"
-version = "1.0.3"
+version = "1.0.4-rc.5"
 edition = "2024"
 
 [dependencies]

docker-compose.prod.yml

@@ -1,10 +1,11 @@
 services:
   rust-app:
-    #    build:
-    #      context: .
-    #      dockerfile: docker/Dockerfile
-    #      target: prod
-    image: portabase/agent:latest
+    build:
+      context: .
+      dockerfile: docker/Dockerfile
+      target: prod
+#    image: portabase/agent:latest
+    platform: linux/arm64
     container_name: rust-prod
     volumes:
       - ./databases.json:/config/config.json

docker-compose.yml

@@ -16,7 +16,7 @@ services:
       APP_ENV: development
       LOG: debug
       TZ: "Europe/Paris"
-      EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiNjc4M2QwY2UtNjY1MS00YzM0LTg4YjYtNDhmMmU5YWQ3NGNhIiwicHVibGljS2V5IjoiLS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tXG5NSUlCQ2dLQ0FRRUFybjR5bk9OUUwzMGZITERBTjRuNGN4OTNkOHZSTVBzaVYyY2xSU1lDWkNHYnlqakhURW5mXG52dzQ5V1ltS0w3STJJK1dLa00wOEMvQ0NISVlMOE13WSsyNjNnN1dmcjJsQzdIOTFQOTFTK1ZtcCtuREZxVGM5XG45VEZiNXpwb09yaXNZQ3o4M2VLeTV1Q3ZCWXpMODhicmhXNVBlU0VPN3R4SFZBaEp3aWVMWU1JTjJvdTBzWFFiXG5DQ200T3FjRGJBeCs1WmNZVjBPM2NTMjlvNWxaYlV4ZHdxcHl6bjFCSnRETXErYS9tVjFDekxBeGNMd0llNW1WXG5LalBjM01EQ3NvcGJ5czhqcFQ2eFcvSGd5b0c0MkhnL0g3RDdKK21BYlRKZ2JyVGVLdkdaQ1dzMDZGR0hrK1RFXG5RdExwOUprR1lhenVDVFF4TlIvTUU0ejFlNGFrOGsxNmlRSURBUUFCXG4tLS0tLUVORCBSU0EgUFVCTElDIEtFWS0tLS0tXG4ifQ"
+      EDGE_KEY: "eyJzZXJ2ZXJVcmwiOiJodHRwOi8vbG9jYWxob3N0Ojg4ODciLCJhZ2VudElkIjoiOGZmMDE4NTQtYjJhMS00ZTE0LTkwMjctZTJiOWIxZjQ1YzdlIiwicHVibGljS2V5IjoiLS0tLS1CRUdJTiBSU0EgUFVCTElDIEtFWS0tLS0tXG5NSUlCQ2dLQ0FRRUE5TWV4M2pmdnVLdFB5YU1ERnh2Ulp2dmd3YkRJQ2JzQi81Wll5NDNSVVRBaXZRYjJiSDdYXG5qRHBQd1lJeCs4UFBrbHlRbDVMQzV1UWZEaCs4SVd4OG1LZ3FvMXpWMkdiZXdGbEdEWFYxVEdyU1ZEU25aSWR4XG52bWdYc29EeXhVMlJvWUFUMS9YMWxuc2YxenZKdkFMTkhXdEhRdk42SjVDZTFSMmFsendVRGFEVXlJNzRmSldQXG5tNTh0SDMrYklXL0VVTXdjaWNxM0oySWw3Vm9KNkZNUHJQL1ZSOWEvdFF1SU1qa200MXpFY2NscExPa2luRkxuXG54NmVUWkFSZUpya2UrbnRvZ2t4TGEyRWV5a1lUNzB4V3hKNWp5ZExBVnRvNkkyQlVLVVJoTkowTUFaU29NYUtvXG5iMGJRcnY1UzExZWllMnMrT2I3aTYzSFpkVUx0UmV1MVJ3SURBUUFCXG4tLS0tLUVORCBSU0EgUFVCTElDIEtFWS0tLS0tXG4ifQ"
       #POOLING: 1
       #DATABASES_CONFIG_FILE: "config.toml"
     extra_hosts:

docker/Dockerfile

@@ -1,7 +1,124 @@
+## =========================
+## Base image (shared)
+## =========================
+#FROM rust:1.92.0 AS base
+#
+#RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+#    pkg-config \
+#    libssl-dev \
+#    tzdata \
+#    redis-server \
+#    ca-certificates \
+#    libpq5 \
+#    libreadline8 \
+#    libncurses6 \
+#    zlib1g \
+#    curl \
+#    mariadb-client \
+#    && apt-get clean \
+#    && rm -rf /var/lib/apt/lists/*
+#
+#ARG TARGETARCH
+#
+## =========================
+## PostgreSQL client binaries (versions 12-18)
+## =========================
+#
+#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; \
+#    elif [ "$TARGETARCH" = "arm64" ]; then \
+#        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
+#
+## =========================
+## Development image
+## =========================
+#FROM base AS dev
+#
+#RUN cargo install cargo-watch
+#
+## Pre-cache dependencies
+#COPY Cargo.toml Cargo.lock ./
+#RUN mkdir src && echo "fn main() {}" > src/main.rs
+#RUN cargo build
+#RUN rm -rf src
+#
+#COPY entrypoint.sh /entrypoint.sh
+#RUN chmod +x /entrypoint.sh
+#
+#CMD ["/entrypoint.sh"]
+#
+## =========================
+## Builder (production)
+## =========================
+#FROM base AS builder
+#
+#COPY . .
+#RUN cargo build --release
+#
+#RUN echo "APP_VERSION=$(cargo pkgid | awk -F# '{print $2}')" > /app/version.env
+#
+## =========================
+## Runtime (production)
+## =========================
+#FROM ubuntu:24.04 AS prod
+#
+#RUN apt-get update && apt-get install -y \
+#    redis-server \
+#    ca-certificates \
+#    tzdata \
+#    libpq5 \
+#    libreadline8 \
+#    libncurses6 \
+#    zlib1g \
+#    mariadb-client \
+#    && rm -rf /var/lib/apt/lists/*
+#
+#
+#WORKDIR /app
+#
+#COPY --from=builder /app/target/release/app /usr/local/bin/app
+#COPY --from=builder /app/version.env /app/version.env
+#COPY entrypoint.sh /entrypoint.sh
+#RUN chmod +x /entrypoint.sh
+#
+#COPY --from=base /usr/lib/postgresql/ /usr/lib/postgresql/
+#COPY --from=base /usr/local/mongodb/bin/ /usr/local/mongodb/bin/
+#
+#
+#ENV APP_ENV=production
+#
+#CMD ["/entrypoint.sh"]
+
 # =========================
 # Base image (shared)
 # =========================
-FROM rust:1.92.0 AS base
+#FROM rust:1.92.0 AS base
+ARG BUILDPLATFORM
+ARG TARGETARCH
+
+FROM --platform=$BUILDPLATFORM rust:1.92.0 AS base
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     pkg-config \
@@ -23,10 +140,7 @@ ARG TARGETARCH
 # =========================
 # PostgreSQL client binaries (versions 12-18)
 # =========================
-
-RUN for v in 12 13 14 15 16 17 18; do \
-        mkdir -p /usr/lib/postgresql/$v/bin; \
-    done
+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/
@@ -35,7 +149,7 @@ 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; \
-    elif [ "$TARGETARCH" = "arm64" ]; then \
+    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; \
@@ -58,7 +172,6 @@ FROM base AS dev
 
 RUN cargo install cargo-watch
 
-# Pre-cache dependencies
 COPY Cargo.toml Cargo.lock ./
 RUN mkdir src && echo "fn main() {}" > src/main.rs
 RUN cargo build
@@ -74,8 +187,31 @@ CMD ["/entrypoint.sh"]
 # =========================
 FROM base AS builder
 
+ARG TARGETARCH
+
+RUN rustup target add x86_64-unknown-linux-gnu aarch64-unknown-linux-gnu
+
+RUN if [ "$TARGETARCH" = "arm64" ]; then \
+        apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
+            gcc-aarch64-linux-gnu \
+            libc6-dev-arm64-cross \
+        && rm -rf /var/lib/apt/lists/*; \
+    fi
+
+ENV CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc
+ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc
+
 COPY . .
-RUN cargo build --release
+
+
+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; \
+    else \
+        cargo build --release --target aarch64-unknown-linux-gnu && \
+        mv /app/target/aarch64-unknown-linux-gnu/release /app/target/release-app; \
+    fi
+
 
 RUN echo "APP_VERSION=$(cargo pkgid | awk -F# '{print $2}')" > /app/version.env
 
@@ -95,10 +231,12 @@ RUN apt-get update && apt-get install -y \
     mariadb-client \
     && rm -rf /var/lib/apt/lists/*
 
-
 WORKDIR /app
 
-COPY --from=builder /app/target/release/app /usr/local/bin/app
+ARG TARGETARCH
+
+COPY --from=builder /app/target/release-app/app /usr/local/bin/app
+
 COPY --from=builder /app/version.env /app/version.env
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
@@ -106,7 +244,7 @@ RUN chmod +x /entrypoint.sh
 COPY --from=base /usr/lib/postgresql/ /usr/lib/postgresql/
 COPY --from=base /usr/local/mongodb/bin/ /usr/local/mongodb/bin/
 
-
 ENV APP_ENV=production
 
 CMD ["/entrypoint.sh"]
+