Skip to content

update/all the things #7

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

Merged
glitchcrab merged 2 commits into from
Sep 3, 2026
Merged

update/all the things #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc27f5c
ubuntu: reduce image size and add tailcat
glitchcrab Sep 3, 2026
563c071
alpine: update base image, add tailcat and remove croc
glitchcrab Sep 3, 2026
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
16 changes: 8 additions & 8 deletions alpine/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
14 changes: 10 additions & 4 deletions ubuntu/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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
Expand Down
Loading