diff --git a/Dockerfile b/Dockerfile index 587913a..345f795 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # stage 1 - Setup cargo-chef -FROM --platform=$BUILDPLATFORM rust:1.74.0-alpine3.17 as planner +FROM --platform=$BUILDPLATFORM rust:1.75.0-alpine3.19 as planner WORKDIR /app RUN apk add gcc g++ make @@ -13,7 +13,7 @@ COPY ./bin/metrsd/Cargo.toml ./bin/metrsd/Cargo.toml RUN cargo chef prepare --recipe-path recipe.json --bin ./bin/metrsd # stage 2 - Cook our dependencies -FROM --platform=$BUILDPLATFORM rust:1.74.0-alpine3.17 as cacher +FROM --platform=$BUILDPLATFORM rust:1.75.0-alpine3.19 as cacher WORKDIR /app COPY --from=planner /usr/local/cargo/bin/cargo-chef /usr/local/cargo/bin/cargo-chef @@ -24,7 +24,7 @@ RUN export ARCH=$(uname -m) \ && cargo chef cook --release --target=$ARCH-unknown-linux-musl --recipe-path recipe.json --bin metrsd # stage 3 - Build our project -FROM --platform=$BUILDPLATFORM rust:1.74.0-alpine3.17 as builder +FROM --platform=$BUILDPLATFORM rust:1.75.0-alpine3.19 as builder ## Build our metrs daemon binary WORKDIR /app @@ -40,7 +40,6 @@ RUN export ARCH=$(uname -m) \ ## Compress the binary RUN export ARCH=$(uname -m) \ - && upx --lzma --best /app/target/$ARCH-unknown-linux-musl/release/metrsd \ && cp /app/target/$ARCH-unknown-linux-musl/release/metrsd /bin/metrsd # stage 4 - Create runtime image diff --git a/crates/metrs_stubs/src/event.rs b/crates/metrs_stubs/src/event.rs index 3db04ba..c992234 100644 --- a/crates/metrs_stubs/src/event.rs +++ b/crates/metrs_stubs/src/event.rs @@ -1,7 +1,8 @@ use super::{CpuInfo, DiskInfo, MemoryInfo, NetworkInfo}; -#[derive(Clone, Debug, serde::Serialize, serde::Deserialize)] -#[serde(rename_all = "PascalCase")] +#[derive(Clone, Debug)] +#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))] +#[cfg_attr(feature = "serde", serde(rename_all = "PascalCase"))] pub struct MetrsdEvent { pub memory: MemoryInfo, pub cpus: Vec,