From 2fcae981fa62d971b699a6299ed605934b84335a Mon Sep 17 00:00:00 2001
From: med-logic <med-logic@yandex.com>
Date: Tue, 18 Aug 2026 21:46:48 +1000
Subject: [PATCH] build: switch container images to Debian

---
 Dockerfile.multiarches | 42 +++++++++++++++++-------------------------
 Dockerfile.singlearch  | 39 ++++++++++++++++-----------------------
 2 files changed, 33 insertions(+), 48 deletions(-)

diff --git a/Dockerfile.multiarches b/Dockerfile.multiarches
index f84f731..29e70bc 100644
--- a/Dockerfile.multiarches
+++ b/Dockerfile.multiarches
@@ -1,40 +1,32 @@
 # Multi-arch Dockerfile for GoReleaser (dockers_v2).
-# Base image :44 is used without arch suffix so the registry can supply the right
-# platform (manifest list). TARGETPLATFORM is set by BuildKit for COPY.
+# TARGETPLATFORM is set by BuildKit for COPY.
 # For custom/local single-arch builds, use Dockerfile.singlearch instead.
 
 ARG TARGETPLATFORM
 
-FROM registry.fedoraproject.org/fedora-minimal:44 AS olivetin-tmputils
-
-RUN microdnf -y install dnf-plugins-core && \
-	dnf-3 config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo && \
-	microdnf install -y docker-ce-cli docker-compose-plugin && microdnf clean all
-
-FROM registry.fedoraproject.org/fedora-minimal:44
+FROM debian:13-slim
 
 LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
 LABEL org.opencontainers.image.title OliveTin
 
 RUN mkdir -p /config /config/entities/ /var/www/olivetin \
-    && \
-	microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \
-		iputils \
-		openssh-clients \
-		kubernetes-client \
-		shadow-utils \
+	&& apt-get update \
+	&& apt-get install -y --no-install-recommends \
 		apprise \
-		jq \
+		ca-certificates \
+		curl \
 		git \
-	&& microdnf clean all
-
-COPY --from=olivetin-tmputils \
-	/usr/bin/docker \
-	/usr/bin/docker
-
-COPY --from=olivetin-tmputils \
-	/usr/libexec/docker/cli-plugins/docker-compose \
-	/usr/libexec/docker/cli-plugins/docker-compose
+		iputils-ping \
+		jq \
+		openssh-client \
+		passwd \
+	&& install -m 0755 -d /etc/apt/keyrings \
+	&& curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc \
+	&& chmod a+r /etc/apt/keyrings/docker.asc \
+	&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" > /etc/apt/sources.list.d/docker.list \
+	&& apt-get update \
+	&& apt-get install -y --no-install-recommends docker-ce-cli docker-compose-plugin \
+	&& rm -rf /var/lib/apt/lists/*
 
 RUN useradd --system --create-home olivetin -u 1000
 
diff --git a/Dockerfile.singlearch b/Dockerfile.singlearch
index e432f87..4c8d4d9 100644
--- a/Dockerfile.singlearch
+++ b/Dockerfile.singlearch
@@ -1,33 +1,26 @@
-FROM --platform=linux/amd64 registry.fedoraproject.org/fedora-minimal:44-x86_64 AS olivetin-tmputils
-
-RUN microdnf -y install dnf-plugins-core && \
-	dnf-3 config-manager --add-repo https://download.docker.com/linux/fedora/docker-ce.repo && \
-	microdnf install -y docker-ce-cli docker-compose-plugin && microdnf clean all
-
-FROM --platform=linux/amd64 registry.fedoraproject.org/fedora-minimal:44-x86_64
+FROM --platform=linux/amd64 debian:13-slim
 
 LABEL org.opencontainers.image.source https://github.com/OliveTin/OliveTin
 LABEL org.opencontainers.image.title OliveTin
 
 RUN mkdir -p /config /config/entities/ /var/www/olivetin \
-    && \
-	microdnf install -y --nodocs --noplugins --setopt=keepcache=0 --setopt=install_weak_deps=0 \
-		iputils \
-		openssh-clients \
-		kubernetes-client \
-		shadow-utils \
+	&& apt-get update \
+	&& apt-get install -y --no-install-recommends \
 		apprise \
-		jq \
+		ca-certificates \
+		curl \
 		git \
-	&& microdnf clean all
-
-COPY --from=olivetin-tmputils \
-	/usr/bin/docker \
-	/usr/bin/docker
-
-COPY --from=olivetin-tmputils \
-	/usr/libexec/docker/cli-plugins/docker-compose \
-	/usr/libexec/docker/cli-plugins/docker-compose
+		iputils-ping \
+		jq \
+		openssh-client \
+		passwd \
+	&& install -m 0755 -d /etc/apt/keyrings \
+	&& curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc \
+	&& chmod a+r /etc/apt/keyrings/docker.asc \
+	&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" > /etc/apt/sources.list.d/docker.list \
+	&& apt-get update \
+	&& apt-get install -y --no-install-recommends docker-ce-cli docker-compose-plugin \
+	&& rm -rf /var/lib/apt/lists/*
 
 RUN useradd --system --create-home olivetin -u 1000