From 894993226f66df32ce0fedb960580f412a22d0e6 Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Tue, 17 Nov 2026 09:49:59 -0300 Subject: [PATCH] Slim down container images and move them to Python 3.14 and Debian Trixie --- Dockerfile | 2 +- containers/auth-gateway/Dockerfile-auth-gateway | 2 +- containers/caddy/Dockerfile-caddy | 5 ----- containers/caddy/entrypoint.sh | 2 +- containers/cluster_node/Dockerfile-cluster_node | 8 +++----- containers/cron/Dockerfile-cron | 4 ++-- containers/dnsmasq/Dockerfile-dnsmasq | 4 ++-- containers/rrdtool/Dockerfile-rrdtool | 7 ++----- 8 files changed, 12 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index 984b886..36147f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ WORKDIR /app # Install necessary runtime packages RUN apt-get update && apt-get install -y --no-install-recommends \ - wireguard \ + wireguard-tools \ iptables \ iproute2 \ net-tools \ diff --git a/containers/auth-gateway/Dockerfile-auth-gateway b/containers/auth-gateway/Dockerfile-auth-gateway index a9dc09f..e0d3d3a 100644 --- a/containers/auth-gateway/Dockerfile-auth-gateway +++ b/containers/auth-gateway/Dockerfile-auth-gateway @@ -1,4 +1,4 @@ -FROM python:3.12-alpine +FROM python:3.14-alpine ENV PYTHONDONTWRITEBYTECODE=1 \ PYTHONUNBUFFERED=1 diff --git a/containers/caddy/Dockerfile-caddy b/containers/caddy/Dockerfile-caddy index 0fc7f85..eb3fdad 100644 --- a/containers/caddy/Dockerfile-caddy +++ b/containers/caddy/Dockerfile-caddy @@ -2,14 +2,9 @@ FROM caddy:2 RUN apk add --no-cache \ python3 \ - py3-pip \ - py3-yaml \ inotify-tools \ bash -RUN python3 -m venv /usr/local/bin/.venv && \ - /usr/local/bin/.venv/bin/pip install --no-cache-dir pyyaml - COPY export_wireguard_webadmin_config.py /usr/local/bin/export_wireguard_webadmin_config.py COPY process_config.py /usr/local/bin/process_config.py COPY entrypoint.sh /usr/local/bin/caddy-entrypoint.sh diff --git a/containers/caddy/entrypoint.sh b/containers/caddy/entrypoint.sh index b9b9a11..6faf43b 100644 --- a/containers/caddy/entrypoint.sh +++ b/containers/caddy/entrypoint.sh @@ -3,7 +3,7 @@ set -eu SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" -PYTHON="${SCRIPT_DIR}/.venv/bin/python3" +PYTHON="python3" JSON_DIR="${JSON_DIR:-/caddy_json_export}" CADDYFILE_PATH="${CADDYFILE_PATH:-/etc/caddy/Caddyfile}" diff --git a/containers/cluster_node/Dockerfile-cluster_node b/containers/cluster_node/Dockerfile-cluster_node index 028d5c4..532af55 100644 --- a/containers/cluster_node/Dockerfile-cluster_node +++ b/containers/cluster_node/Dockerfile-cluster_node @@ -1,10 +1,10 @@ # Single stage build for Cluster Node -FROM python:3.12-slim +FROM python:3.14-slim WORKDIR /app # Install necessary runtime packages RUN apt-get update && apt-get install -y --no-install-recommends \ - wireguard \ + wireguard-tools \ iptables \ iproute2 \ net-tools \ @@ -21,13 +21,11 @@ COPY requirements.txt /app/requirements.txt RUN pip install --no-cache-dir -r requirements.txt # Copy the application code -COPY . /app/ +COPY cluster_worker.py entrypoint.sh /app/ # Set execution permissions on scripts RUN chmod +x /app/entrypoint.sh -ARG SERVER_ADDRESS -ARG DEBUG_MODE ENTRYPOINT ["/app/entrypoint.sh"] CMD ["python", "-u", "/app/cluster_worker.py"] diff --git a/containers/cron/Dockerfile-cron b/containers/cron/Dockerfile-cron index 5eb8ad1..130d2e9 100644 --- a/containers/cron/Dockerfile-cron +++ b/containers/cron/Dockerfile-cron @@ -1,6 +1,6 @@ -FROM ubuntu:latest +FROM debian:trixie-slim -RUN apt-get update && apt-get install -y cron curl && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y --no-install-recommends cron curl ca-certificates procps && rm -rf /var/lib/apt/lists/* COPY entrypoint.sh /entrypoint.sh COPY cron_runner.sh /cron_runner.sh diff --git a/containers/dnsmasq/Dockerfile-dnsmasq b/containers/dnsmasq/Dockerfile-dnsmasq index 8ea0614..02bdbc6 100644 --- a/containers/dnsmasq/Dockerfile-dnsmasq +++ b/containers/dnsmasq/Dockerfile-dnsmasq @@ -1,9 +1,9 @@ -FROM ubuntu:latest +FROM debian:trixie-slim ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && \ - apt-get install -y dnsmasq nano inotify-tools psmisc && \ + apt-get install -y --no-install-recommends dnsmasq nano inotify-tools procps && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* diff --git a/containers/rrdtool/Dockerfile-rrdtool b/containers/rrdtool/Dockerfile-rrdtool index 46685f9..a226337 100644 --- a/containers/rrdtool/Dockerfile-rrdtool +++ b/containers/rrdtool/Dockerfile-rrdtool @@ -1,14 +1,11 @@ -FROM python:3.12-slim +FROM python:3.14-slim WORKDIR /app -RUN apt-get update && apt-get install -y \ +RUN apt-get update && apt-get install -y --no-install-recommends \ net-tools \ inetutils-ping \ - inetutils-traceroute \ nano \ - vim-nox \ rrdtool \ - librrd-dev \ && rm -rf /var/lib/apt/lists/* COPY requirements.txt .