mirror of
https://github.com/malarinv/iperf3-monitor.git
synced 2026-03-07 21:12:34 +00:00
2e019b16ff
This commit includes two main changes:
1. **Fix Dockerfile library path for amd64:**
- I updated the `exporter/Dockerfile` to correctly determine the source path for `libiperf.so.0` when building for different architectures.
- Specifically, for `TARGETARCH=amd64`, the path `/usr/lib/x86_64-linux-gnu/libiperf.so.0` is now used.
- For `TARGETARCH=arm64`, the path `/usr/lib/aarch64-linux-gnu/libiperf.so.0` is used.
- I achieved this by copying the library to a canonical temporary location in the builder stage based on `TARGETARCH`, and then copying it from this location into the final image. This resolves an issue where builds for `amd64` would fail to find the library.
2. **Add Helm chart option to disable dependencies:**
- I added a new option `dependencies.install` (default: `true`) to `charts/iperf3-monitor/values.yaml`.
- This allows you to disable the installation of managed dependencies (i.e., Prometheus Operator via `kube-prometheus-stack` or `prometheus-operator` from TrueCharts) even if `serviceMonitor.enabled` is true.
- I updated the `condition` for these dependencies in `charts/iperf3-monitor/Chart.yaml` to `dependencies.install, serviceMonitor.enabled, ...`.
- This is useful for you if you manage your Prometheus Operator installation separately.
52 lines
1.7 KiB
Docker
52 lines
1.7 KiB
Docker
# Stage 1: Build stage with dependencies
|
|
FROM python:3.9-slim as builder
|
|
|
|
# Declare TARGETARCH for use in this stage
|
|
ARG TARGETARCH
|
|
WORKDIR /app
|
|
|
|
# Install iperf3 and build dependencies
|
|
RUN apt-get update && \
|
|
apt-get install -y --no-install-recommends gcc iperf3 libiperf-dev && \
|
|
rm -rf /var/lib/apt/lists/*
|
|
|
|
# Determine the correct libiperf source directory based on TARGETARCH
|
|
# and copy libiperf.so.0 to a canonical temporary location /tmp/lib/ within the builder stage.
|
|
RUN echo "Builder stage TARGETARCH: ${TARGETARCH}" && \
|
|
LIBIPERF_SRC_DIR_SEGMENT="" && \
|
|
if [ "${TARGETARCH}" = "amd64" ]; then \
|
|
LIBIPERF_SRC_DIR_SEGMENT="x86_64-linux-gnu"; \
|
|
elif [ "${TARGETARCH}" = "arm64" ]; then \
|
|
LIBIPERF_SRC_DIR_SEGMENT="aarch64-linux-gnu"; \
|
|
else \
|
|
echo "Unsupported TARGETARCH in builder: ${TARGETARCH}" && exit 1; \
|
|
fi && \
|
|
mkdir -p /tmp/lib && \
|
|
cp "/usr/lib/${LIBIPERF_SRC_DIR_SEGMENT}/libiperf.so.0" /tmp/lib/libiperf.so.0
|
|
|
|
# Install Python dependencies
|
|
COPY requirements.txt .
|
|
RUN pip install --no-cache-dir -r requirements.txt
|
|
|
|
# Stage 2: Final runtime stage
|
|
FROM python:3.9-slim
|
|
|
|
WORKDIR /app
|
|
|
|
# Copy iperf3 binary from the builder stage
|
|
COPY --from=builder /usr/bin/iperf3 /usr/bin/iperf3
|
|
# Copy the prepared libiperf.so.0 from the builder's canonical temporary location
|
|
# into a standard library path in the final image.
|
|
COPY --from=builder /tmp/lib/libiperf.so.0 /usr/lib/libiperf.so.0
|
|
|
|
# Copy installed Python packages from the builder stage
|
|
COPY --from=builder /usr/local/lib/python3.9/site-packages /usr/local/lib/python3.9/site-packages
|
|
|
|
# Copy the exporter application code
|
|
COPY exporter.py .
|
|
|
|
# Expose the metrics port
|
|
EXPOSE 9876
|
|
|
|
# Set the entrypoint
|
|
CMD ["python", "exporter.py"] |