From 6b1161f62bf6eee21e3d3b55811a1c60371fdbf5 Mon Sep 17 00:00:00 2001
From: Max Resnick <max@ofmax.li>
Date: Sat, 25 Oct 2025 23:31:11 -0700
Subject: chore: rename cluster, bump base, fix missing user

---
 src/base/Dockerfile             |  4 ++++
 src/base/VERSION                |  2 +-
 src/cluster-debug/Dockerfile    | 23 +++++++++++++++++++++++
 src/cluster-debug/VERSION       |  1 +
 src/cluster-debug/entrypoint.sh | 10 ++++++++++
 src/cluster/Dockerfile          | 23 -----------------------
 src/cluster/VERSION             |  1 -
 src/cluster/entrypoint.sh       | 10 ----------
 src/unbound-adblock/VERSION     |  2 +-
 9 files changed, 40 insertions(+), 36 deletions(-)
 create mode 100644 src/cluster-debug/Dockerfile
 create mode 100644 src/cluster-debug/VERSION
 create mode 100755 src/cluster-debug/entrypoint.sh
 delete mode 100644 src/cluster/Dockerfile
 delete mode 100644 src/cluster/VERSION
 delete mode 100755 src/cluster/entrypoint.sh

diff --git a/src/base/Dockerfile b/src/base/Dockerfile
index 92c7c5a..df82326 100644
--- a/src/base/Dockerfile
+++ b/src/base/Dockerfile
@@ -25,4 +25,8 @@ WORKDIR /opt/app
 FROM debian:bookworm-slim as finale
 ENV DEBIAN_FRONTEND=noninteractive
 COPY bin/install_deb /usr/local/bin/install_deb
+RUN useradd -s /usr/sbin/nologin \
+            --create-home \
+            --home-dir /opt/app \
+            app
 RUN install_deb ca-certificates
diff --git a/src/base/VERSION b/src/base/VERSION
index b043aa6..992ac75 100644
--- a/src/base/VERSION
+++ b/src/base/VERSION
@@ -1 +1 @@
-v0.5.0
+v0.5.1
diff --git a/src/cluster-debug/Dockerfile b/src/cluster-debug/Dockerfile
new file mode 100644
index 0000000..2a02007
--- /dev/null
+++ b/src/cluster-debug/Dockerfile
@@ -0,0 +1,23 @@
+ARG BASE_VER=latest
+FROM gcr.io/google-containers/pause:latest
+
+FROM golang:1.25-trixie
+WORKDIR /app
+RUN git clone https://git.ofmax.li/go-echo \
+        && cd go-echo \
+        && go build -o /go-echo
+
+FROM public.ecr.aws/x2w2w0z4/base:${BASE_VER}
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update -y \
+        && apt-get upgrade -y \
+                && apt-get install -y curl dnsutils jq vim kubernetes-client tmux ldap-utils ncat nmap hping3 python3-minimal unattended-upgrades \
+                && unattended-upgrades
+COPY --from=0 /pause /usr/local/bin/pause
+COPY --from=1 /app/go-echo /usr/local/bin/go-echo
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+
+USER app
+WORKDIR /opt/app
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+CMD ["pause"]
diff --git a/src/cluster-debug/VERSION b/src/cluster-debug/VERSION
new file mode 100644
index 0000000..1474d00
--- /dev/null
+++ b/src/cluster-debug/VERSION
@@ -0,0 +1 @@
+v0.2.0
diff --git a/src/cluster-debug/entrypoint.sh b/src/cluster-debug/entrypoint.sh
new file mode 100755
index 0000000..31112c0
--- /dev/null
+++ b/src/cluster-debug/entrypoint.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+cmd="${1}"
+case "${cmd}" in
+    "pause")
+        exec pause;;
+    "echoserver")
+        exec go-echo;;
+    *) echo >&2 "Invalid option: $@"; exit 1;;
+esac
diff --git a/src/cluster/Dockerfile b/src/cluster/Dockerfile
deleted file mode 100644
index d8627cf..0000000
--- a/src/cluster/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-ARG BASE_VER=latest
-FROM gcr.io/google-containers/pause:latest
-
-FROM golang:1.17-bullseye                                          
-WORKDIR /app                                                       
-RUN git clone https://git.ofmax.li/go-echo \                       
-        && cd go-echo \                                            
-        && go build -o /go-echo                                    
-                                                                   
-FROM public.ecr.aws/x2w2w0z4/base:${BASE_VER} 
-ENV DEBIAN_FRONTEND=noninteractive
-RUN apt-get update -y \
-        && apt-get upgrade -y \
-                && apt-get install -y curl dnsutils jq vim kubernetes-client tmux ldap-utils ncat nmap hping3 python3-minimal unattended-upgrades \
-                && unattended-upgrades
-COPY --from=0 /pause /usr/local/bin/pause
-COPY --from=1 /app/go-echo /usr/local/bin/go-echo
-COPY entrypoint.sh /usr/local/bin/entrypoint.sh
-
-USER app
-WORKDIR /opt/app
-ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
-CMD ["pause"]
diff --git a/src/cluster/VERSION b/src/cluster/VERSION
deleted file mode 100644
index 1474d00..0000000
--- a/src/cluster/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-v0.2.0
diff --git a/src/cluster/entrypoint.sh b/src/cluster/entrypoint.sh
deleted file mode 100755
index 31112c0..0000000
--- a/src/cluster/entrypoint.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-cmd="${1}"
-case "${cmd}" in
-    "pause")
-        exec pause;;
-    "echoserver")
-        exec go-echo;;
-    *) echo >&2 "Invalid option: $@"; exit 1;;
-esac
diff --git a/src/unbound-adblock/VERSION b/src/unbound-adblock/VERSION
index 5c314e5..77cada2 100644
--- a/src/unbound-adblock/VERSION
+++ b/src/unbound-adblock/VERSION
@@ -1 +1 @@
-v0.0.5
+v0.0.6
-- 
cgit v1.2.3