infra
/
iperf3-monitor
mirror of https://github.com/malarinv/iperf3-monitor.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: Simplify Dockerfile by removing builder stage for iperf3 installation (#15)

pull/16/head v0.1.7
Malar Kannan 2025-06-21 02:00:24 +05:30 committed by GitHub
parent 1eeb4b20df
commit 0a3249f30b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
exporter/Dockerfile
View File

@ -5,25 +5,13 @@ FROM python:3.9-slim as builder
ARG TARGETARCH ARG TARGETARCH
WORKDIR /app WORKDIR /app
# Install iperf3 and build dependencies # Minimal dependencies for builder stage if any Python packages had C extensions.
RUN apt-get update && \ # Assuming requirements.txt does not need gcc or other build tools for now.
apt-get install -y --no-install-recommends gcc iperf3 libiperf-dev && \ # If pip install fails later, add necessary build tools (e.g., gcc, python3-dev) here.
RUN apt-get update &&
# apt-get install -y --no-install-recommends gcc python3-dev # Example if needed
rm -rf /var/lib/apt/lists/* 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 # Install Python dependencies
COPY requirements.txt . COPY requirements.txt .
RUN pip install --no-cache-dir -r requirements.txt RUN pip install --no-cache-dir -r requirements.txt
@ -33,11 +21,11 @@ FROM python:3.9-slim
WORKDIR /app WORKDIR /app
# Copy iperf3 binary from the builder stage # Install iperf3 and its runtime dependency libsctp1 directly in the final stage.
COPY --from=builder /usr/bin/iperf3 /usr/bin/iperf3 # This simplifies the Dockerfile by removing the need to copy iperf3 components from the builder.
# Copy the prepared libiperf.so.0 from the builder's canonical temporary location RUN apt-get update &&
# into a standard library path in the final image. apt-get install -y --no-install-recommends iperf3 libsctp1 &&
COPY --from=builder /tmp/lib/libiperf.so.0 /usr/lib/libiperf.so.0 rm -rf /var/lib/apt/lists/*
# Copy installed Python packages from the builder stage # 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 --from=builder /usr/local/lib/python3.9/site-packages /usr/local/lib/python3.9/site-packages