Skip to content

Lightweight server monitoring with historical data, docker stats, and alerts.

Add ZFS pool/dataset utilities (zpool, zfs) to the full and slim nvidia agent images (#2311)

Sven van Ginkel08d813620c27
diff --git a/internal/dockerfile_agent_nvidia b/internal/dockerfile_agent_nvidia
index 5843bd682..aa5c3ff7d 100644
--- a/internal/dockerfile_agent_nvidia
+++ b/internal/dockerfile_agent_nvidia
@@ -43,6 +43,11 @@ COPY --from=builder /app/agent/test-data/amdgpu.ids /usr/share/libdrm/amdgpu.ids
# Copy smartmontools binaries and config files
COPY --from=smartmontools-builder /usr/sbin/smartctl /usr/sbin/smartctl
+# Install ZFS userspace utilities (zpool, zfs) for pool/dataset monitoring
+RUN apt-get update && apt-get install -y --no-install-recommends \
+ zfsutils-linux \
+ && apt-get clean && rm -rf /var/lib/apt/lists/*
+
# Ensure data persistence across container recreations
VOLUME ["/var/lib/beszel-agent"]
diff --git a/internal/dockerfile_agent_nvidia_slim b/internal/dockerfile_agent_nvidia_slim
index 51144a5e2..cfb6420b7 100644
--- a/internal/dockerfile_agent_nvidia_slim
+++ b/internal/dockerfile_agent_nvidia_slim
@@ -65,6 +65,32 @@ RUN set -eux; \
cp -v "$interp" "/out/rootfs$interp"; \
fi
+# --------------------------
+# ZFS utilities builder stage
+# --------------------------
+FROM --platform=$TARGETPLATFORM debian:bookworm-slim AS zfsutils-builder
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+ zfsutils-linux \
+ && rm -rf /var/lib/apt/lists/*
+
+# Copy the zpool/zfs binaries and their required runtime libraries
+RUN set -eux; \
+ mkdir -p /out/rootfs/lib /out/rootfs/lib64 /out/rootfs/usr/lib; \
+ for bin in /usr/sbin/zpool /usr/sbin/zfs; do \
+ mkdir -p "/out/rootfs$(dirname "$bin")"; \
+ cp -v "$bin" "/out/rootfs$bin"; \
+ ldd "$bin" \
+ | awk '{print $3}' \
+ | grep '^/' \
+ | xargs -r -I '{}' sh -c 'mkdir -p "/out/rootfs$(dirname "{}")"; cp -v "{}" "/out/rootfs{}"'; \
+ interp="$(ldd "$bin" | awk "/ld-linux/ {print \$1}")"; \
+ if [ -n "$interp" ] && [ -e "$interp" ]; then \
+ mkdir -p "/out/rootfs$(dirname "$interp")"; \
+ cp -v "$interp" "/out/rootfs$interp"; \
+ fi; \
+ done
+
# --------------------------
# Final image: lightweight multi-arch NVIDIA agent (slim)
# --------------------------
@@ -78,6 +104,9 @@ COPY --from=builder /app/agent/test-data/amdgpu.ids /usr/share/libdrm/amdgpu.ids
COPY --from=smartmontools-builder /usr/sbin/smartctl /usr/sbin/smartctl
COPY --from=smartmontools-builder /out/rootfs/ /
+# Copy ZFS utilities (zpool, zfs) binaries and required runtime libraries
+COPY --from=zfsutils-builder /out/rootfs/ /
+
# nvidia-smi is intentionally not bundled.
# Mount the host binary instead, for example:
# - /usr/bin/nvidia-smi:/usr/bin/nvidia-smi:ro