From 1735a97dced6f9ca4a944bc2e1e25bc859d2ead5 Mon Sep 17 00:00:00 2001 From: Joachim Wiberg Date: Fri, 22 Aug 2025 15:27:41 +0200 Subject: [PATCH] test/infamy: add nmap to test container - Sort packages alphabetically - Add nmap for firewall tests Signed-off-by: Joachim Wiberg --- test/.env | 2 +- test/docker/Dockerfile | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/test/.env b/test/.env index 09bf096f..962afdf3 100644 --- a/test/.env +++ b/test/.env @@ -2,7 +2,7 @@ # shellcheck disable=SC2034,SC2154 # Current container image -INFIX_TEST=ghcr.io/kernelkit/infix-test:2.4 +INFIX_TEST=ghcr.io/kernelkit/infix-test:2.5 ixdir=$(readlink -f "$testdir/..") logdir=$(readlink -f "$testdir/.log") diff --git a/test/docker/Dockerfile b/test/docker/Dockerfile index c9682dd0..81a07e08 100644 --- a/test/docker/Dockerfile +++ b/test/docker/Dockerfile @@ -1,8 +1,12 @@ FROM alpine:3.18.0 +# NOTE: please add packages alphabetically! RUN apk add --no-cache \ busybox-extras \ + curl \ e2fsprogs \ + e2tools \ + ethtool \ fakeroot \ gcc \ git \ @@ -13,7 +17,10 @@ RUN apk add --no-cache \ libc-dev \ libyang-dev \ linux-headers \ + make \ + nmap \ openssh-client \ + openssl \ python3-dev \ qemu-img \ qemu-system-x86_64 \ @@ -22,12 +29,7 @@ RUN apk add --no-cache \ squashfs-tools \ sshpass \ tcpdump \ - tshark \ - openssl \ - curl \ - e2tools \ - make \ - ethtool + tshark ARG MTOOL_VERSION="3.0" RUN wget https://github.com/troglobit/mtools/releases/download/v3.0/mtools-$MTOOL_VERSION.tar.gz -O /tmp/mtools-$MTOOL_VERSION.tar.gz