From cc27f5cb78d5fa236632bdaaf11ae1f7a37c9bf3 Mon Sep 17 00:00:00 2001
From: Simon Weald <glitchcrab-github@simonweald.com>
Date: Thu, 3 Sep 2026 21:27:09 +0100
Subject: [PATCH 1/2] ubuntu: reduce image size and add tailcat

---
 ubuntu/Dockerfile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile
index 2aa312f..c904660 100644
--- a/ubuntu/Dockerfile
+++ b/ubuntu/Dockerfile
@@ -1,10 +1,11 @@
 FROM ubuntu:noble
 MAINTAINER simon@simonweald.com
 
+ENV TAILCAT_VER="0.4.0"
 ENV PACKAGES="\
-  sudo bash-completion vim jq ca-certificates openssl screen \
-  dnsutils tcpdump curl nmap tcpflow iftop mtr-tiny netcat-openbsd bridge-utils iperf ngrep tcptraceroute telnet iproute2 iputils-ping wget \
-  htop strace iotop ltrace ncdu hdparm pciutils psmisc tree pv wormhole-william"
+  sudo bash-completion vim jq ca-certificates openssl screen openssh-client \
+  knot-dnsutils tcpdump curl nmap iftop mtr-tiny netcat-openbsd bridge-utils iperf ngrep tcptraceroute telnet iproute2 iputils-ping wget \
+  htop strace iotop-c ltrace ncdu hdparm pciutils psmisc tree pv"
 
 ENV REMOVE_USERS="\
 games \
@@ -20,7 +21,12 @@ RUN apt-get update && \
     apt-get install -y $PACKAGES --no-install-recommends && \
     apt-get clean && \
     apt-get autoremove -y && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/* /usr/share/nmap/nmap-os-db && \
+    ln -s /usr/bin/kdig /usr/local/bin/dig
+
+RUN wget https://github.com/tailscale/tailcat/releases/download/v${TAILCAT_VER}/tailcat_${TAILCAT_VER}_linux_amd64.deb -O /tmp/tailcat.deb && \
+    dpkg -i /tmp/tailcat.deb && \
+    rm /tmp/tailcat.deb
 
 RUN for user in $REMOVE_USERS; do userdel --force --remove $user ; done && \
     adduser --home "/home/notroot" --gecos "unprivileged user" --disabled-password --disabled-login --shell /bin/bash -u 1000 notroot

From 563c071c3d71e22b7f08663bd1e407e3aac67900 Mon Sep 17 00:00:00 2001
From: Simon Weald <glitchcrab-github@simonweald.com>
Date: Thu, 3 Sep 2026 21:27:48 +0100
Subject: [PATCH 2/2] alpine: update base image, add tailcat and remove croc

---
 alpine/Dockerfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index cf41ef8..2dc4a1d 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -1,18 +1,18 @@
-FROM alpine:3.12.0
+FROM alpine:3.24.1
 MAINTAINER simon@simonweald.com
 
-ENV CROC_VER="8.0.13"
+ENV TAILCAT_VER="0.4.0"
 ENV PACKAGES="\
-  sudo busybox-extras bash bash-completion ncurses vim jq ca-certificates openssl screen \
+  sudo busybox-extras bash bash-completion ncurses vim jq ca-certificates openssl screen openssh-client \
   bind-tools iputils tcpdump curl nmap tcpflow iftop net-tools mtr netcat-openbsd bridge-utils iperf ngrep tcptraceroute \
   htop atop strace iotop ltrace ncdu hdparm pciutils psmisc tree pv"
 
 RUN apk add --no-cache $PACKAGES && \
-    mkdir /tmp/croc && \
-    wget https://github.com/schollz/croc/releases/download/v${CROC_VER}/croc_${CROC_VER}_Linux-64bit.tar.gz -O /tmp/croc/croc.tar.gz && \
-    tar x -f /tmp/croc/croc.tar.gz -C /tmp/croc/ && \
-    mv /tmp/croc/croc /usr/local/bin/ && \
-    rm -rf /tmp/croc
+    mkdir /tmp/tailcat && \
+    wget https://github.com/tailscale/tailcat/releases/download/v${TAILCAT_VER}/tailcat_${TAILCAT_VER}_linux_amd64.tar.gz -O /tmp/tailcat/tailcat.tar.gz && \
+    tar x -f /tmp/tailcat/tailcat.tar.gz -C /tmp/tailcat/ && \
+    mv /tmp/tailcat/tailcat /usr/local/bin/ && \
+    rm -rf /tmp/tailcat
 
 RUN adduser -h "/home/notroot" -g "unprivileged user" -s /bin/bash -u 1000 -D notroot notroot