Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automated backport of #1793: nettest: add iproute #1796

Merged
merged 3 commits into from
Jan 7, 2025
Merged

Automated backport of #1793: nettest: add iproute #1796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5324ce3
nettest: add iproute
skitt Jan 3, 2025
66bef6a
nettest: pass VERSION as an argument
skitt Jan 3, 2025
6a9c03f
Revert to busybox nc for metricsproxy
skitt Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion package/Dockerfile.nettest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
ARG FEDORA_VERSION=41

FROM --platform=${BUILDPLATFORM} fedora:${FEDORA_VERSION} AS base
ARG VERSION
ARG FEDORA_VERSION
ARG TARGETPLATFORM

COPY scripts/shared/dnf_install /

RUN /dnf_install -a ${TARGETPLATFORM} -v ${FEDORA_VERSION} -r /output/nettest \
glibc bash glibc-minimal-langpack coreutils-single libcurl-minimal \
bind-utils curl-minimal iperf3 iputils netperf nmap-ncat tcpdump
bind-utils busybox curl-minimal iperf3 iproute iputils netperf nmap-ncat tcpdump

FROM scratch
ARG TARGETPLATFORM
ARG VERSION
ENV PATH="/app:$PATH"

COPY --from=base /output/nettest /
Expand Down
2 changes: 1 addition & 1 deletion scripts/nettest/metricsproxy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh

# Arguments: source-port target-IP target-port
exec /usr/bin/ncat -v -lk -p "$1" -c "/usr/bin/ncat $2 $3"
exec /usr/sbin/busybox nc -v -lk -p "$1" -e /usr/sbin/busybox nc "$2" "$3"
Loading