From 01d1b8339c1aa2f75331f57d42d0776e888bbf30 Mon Sep 17 00:00:00 2001 From: dawn Date: Tue, 4 Aug 2026 14:35:54 +0300 Subject: [PATCH] bobbin/containerfiles,localinfra: use proper hydrant container file Signed-off-by: dawn --- bobbin/containerfiles/hydrant.Containerfile | 9 ++++++++- docker-compose.yml | 6 ++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/bobbin/containerfiles/hydrant.Containerfile b/bobbin/containerfiles/hydrant.Containerfile index 94e0d63b2..60c942270 100644 --- a/bobbin/containerfiles/hydrant.Containerfile +++ b/bobbin/containerfiles/hydrant.Containerfile @@ -1,10 +1,17 @@ +FROM alpine:3.22 AS source +ARG HYDRANT_REPO=https://tangled.org/ptr.pet/hydrant.git +ARG HYDRANT_REF=main +RUN apk add --no-cache git \ + && git clone --depth 1 --branch "$HYDRANT_REF" "$HYDRANT_REPO" /hydrant + FROM rust:1.96-slim-trixie AS builder RUN apt-get update && apt-get install -y --no-install-recommends \ ca-certificates pkg-config perl make cmake clang mold \ && rm -rf /var/lib/apt/lists/* ENV RUSTFLAGS="-C linker=clang -C link-arg=-fuse-ld=mold" WORKDIR /src -COPY . ./ +COPY --from=source /hydrant ./ +# remove hydrants wild linker config RUN rm -f .cargo/config.toml RUN cargo build --release --bin hydrant RUN strip target/release/hydrant diff --git a/docker-compose.yml b/docker-compose.yml index dce4f7bd8..dac8e80eb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -433,9 +433,11 @@ services: hydrant: build: - context: https://tangled.org/ptr.pet/hydrant.git#main + context: . + dockerfile: bobbin/containerfiles/hydrant.Containerfile + args: + HYDRANT_REF: main restart: unless-stopped - user: root environment: HYDRANT_API_BIND: 0.0.0.0:3000 HYDRANT_DATABASE_PATH: /data/hydrant.db -- 2.51.2