From f6a47f351c45b440a61b5bba1305147e0b2a5f96 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Mon, 27 Oct 2025 22:10:29 +0800
Subject: [PATCH] Revert "feat(release): reduce image size by running
 autoremove, clean and removing lists" (#6268)

---
 docker/builder-go.dockerfile  |  5 +----
 docker/debian-base.dockerfile | 24 +++++++++---------------
 docker/dockerfile             | 11 +++--------
 3 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/docker/builder-go.dockerfile b/docker/builder-go.dockerfile
index 857476988..3a9d78248 100644
--- a/docker/builder-go.dockerfile
+++ b/docker/builder-go.dockerfile
@@ -19,7 +19,4 @@ RUN apt update && \
     curl -sL https://deb.nodesource.com/setup_18.x | bash && \
     apt --yes --no-install-recommends install nodejs && \
     node ./extra/build-healthcheck.js $TARGETPLATFORM && \
-    apt --yes remove nodejs && \
-    apt autoremove -y --purge && \
-    apt clean && \
-    rm -rf /var/lib/apt/lists/*
+    apt --yes remove nodejs
diff --git a/docker/debian-base.dockerfile b/docker/debian-base.dockerfile
index 14072ef5b..ca5fc43ec 100644
--- a/docker/debian-base.dockerfile
+++ b/docker/debian-base.dockerfile
@@ -5,10 +5,7 @@ COPY ./extra/download-apprise.mjs ./download-apprise.mjs
 RUN apt update && \
     apt --yes --no-install-recommends install curl && \
     npm install cheerio semver && \
-    node ./download-apprise.mjs && \
-    apt autoremove -y --purge && \
-    apt clean && \
-    rm -rf /var/lib/apt/lists/*
+    node ./download-apprise.mjs
 
 # Base Image (Slim)
 # If the image changed, the second stage image should be changed too
@@ -34,9 +31,8 @@ RUN apt update && \
         curl  \
         sudo \
         nscd && \
-    apt autoremove -y --purge && \
-    apt clean && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/* && \
+    apt --yes autoremove
 
 # apprise = for notifications (Install from the deb package, as the stable one is too old) (workaround for #4867)
 # Switching to testing repo is no longer working, as the testing repo is not bookworm anymore.
@@ -45,10 +41,9 @@ RUN apt update && \
 COPY --from=download-apprise /app/apprise.deb ./apprise.deb
 RUN apt update && \
     apt --yes --no-install-recommends install ./apprise.deb python3-paho-mqtt && \
+    rm -rf /var/lib/apt/lists/* && \
     rm -f apprise.deb && \
-    apt autoremove -y --purge && \
-    apt clean && \
-    rm -rf /var/lib/apt/lists/*
+    apt --yes autoremove
 
 # Install cloudflared
 RUN curl https://pkg.cloudflare.com/cloudflare-main.gpg --output /usr/share/keyrings/cloudflare-main.gpg && \
@@ -56,14 +51,14 @@ RUN curl https://pkg.cloudflare.com/cloudflare-main.gpg --output /usr/share/keyr
     apt update && \
     apt install --yes --no-install-recommends cloudflared && \
     cloudflared version && \
-    apt autoremove -y --purge && \
-    apt clean && \
-    rm -rf /var/lib/apt/lists/*
+    rm -rf /var/lib/apt/lists/* && \
+    apt --yes autoremove
 
 # For nscd
 COPY ./docker/etc/nscd.conf /etc/nscd.conf
 COPY ./docker/etc/sudoers /etc/sudoers
 
+
 # Full Base Image
 # MariaDB, Chromium and fonts
 # Make sure to reuse the slim image here. Uncomment the above line if you want to build it from scratch.
@@ -72,7 +67,6 @@ FROM louislam/uptime-kuma:base2-slim AS base2
 ENV UPTIME_KUMA_ENABLE_EMBEDDED_MARIADB=1
 RUN apt update && \
     apt --yes --no-install-recommends install chromium fonts-indic fonts-noto fonts-noto-cjk mariadb-server && \
-    apt autoremove -y --purge && \
-    apt clean && \
     rm -rf /var/lib/apt/lists/* && \
+    apt --yes autoremove && \
     chown -R node:node /var/lib/mysql
diff --git a/docker/dockerfile b/docker/dockerfile
index e19b8640e..e2a301e7b 100644
--- a/docker/dockerfile
+++ b/docker/dockerfile
@@ -70,10 +70,7 @@ RUN apt update \
     && chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg \
     && echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
     && apt update \
-    && apt --yes --no-install-recommends install git \
-    && apt autoremove -y --purge \
-    && apt clean \
-    && rm -rf /var/lib/apt/lists/*
+    && apt --yes --no-install-recommends  install git
 
 ## Empty the directory, because we have to clone the Git repo.
 RUN rm -rf ./* && chown node /app
@@ -98,10 +95,7 @@ CMD ["npm", "run", "start-pr-test"]
 FROM louislam/uptime-kuma:base2 AS upload-artifact
 WORKDIR /
 RUN apt update && \
-    apt --yes install curl file && \
-    apt autoremove -y --purge && \
-    apt clean && \
-    rm -rf /var/lib/apt/lists/*
+    apt --yes install curl file
 
 COPY --from=build /app /app
 
@@ -121,3 +115,4 @@ RUN chmod +x /app/extra/upload-github-release-asset.sh
 # Dist only
 RUN cd /app && tar -zcvf $DIST dist
 RUN /app/extra/upload-github-release-asset.sh github_api_token=$GITHUB_TOKEN owner=louislam repo=uptime-kuma tag=$VERSION filename=/app/$DIST
+