From 09f4c42eed0c96d66d6c447c50424b32bbd7b40b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 4 Apr 2025 20:30:45 +0200
Subject: [PATCH 1/6] Drop manually installing dependent library
This was fixed upstream
---
Dockerfile.debian-bookworm-hugo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Dockerfile.debian-bookworm-hugo b/Dockerfile.debian-bookworm-hugo
index 3ec538f..f0f87a7 100644
--- a/Dockerfile.debian-bookworm-hugo
+++ b/Dockerfile.debian-bookworm-hugo
@@ -4,7 +4,7 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get -qq update && \
apt-get -qq dist-upgrade && \
- apt-get -qq install hugo libwebp7 libwebp-dev && \
+ apt-get -qq install hugo && \
apt-get -qq clean
RUN ldconfig -v
RUN hugo version
--
GitLab
From c6602d777fd33a8b533534c90d74940926e8a06f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 4 Apr 2025 20:31:22 +0200
Subject: [PATCH 2/6] Drop dist-upgrade
according to hadolint as that often breaks things
---
Dockerfile.debian-bookworm-hugo | 2 +-
Dockerfile.debian-trixie-hugo | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Dockerfile.debian-bookworm-hugo b/Dockerfile.debian-bookworm-hugo
index f0f87a7..9985c4d 100644
--- a/Dockerfile.debian-bookworm-hugo
+++ b/Dockerfile.debian-bookworm-hugo
@@ -3,7 +3,7 @@ FROM debian:bookworm
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get -qq update && \
- apt-get -qq dist-upgrade && \
+ apt-get -qq upgrade && \
apt-get -qq install hugo && \
apt-get -qq clean
RUN ldconfig -v
diff --git a/Dockerfile.debian-trixie-hugo b/Dockerfile.debian-trixie-hugo
index f075b5a..9565b32 100644
--- a/Dockerfile.debian-trixie-hugo
+++ b/Dockerfile.debian-trixie-hugo
@@ -3,6 +3,6 @@ FROM debian:trixie
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get -qq update && \
- apt-get -qq dist-upgrade && \
+ apt-get -qq upgrade && \
apt-get -qq install hugo && \
apt-get -qq clean
--
GitLab
From a7ed3e9b0096b10cfd3fb0cdd58c96be9a7202c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 4 Apr 2025 20:31:48 +0200
Subject: [PATCH 3/6] Drop no longer required ldconfig
---
Dockerfile.debian-bookworm-hugo | 1 -
1 file changed, 1 deletion(-)
diff --git a/Dockerfile.debian-bookworm-hugo b/Dockerfile.debian-bookworm-hugo
index 9985c4d..39c4d94 100644
--- a/Dockerfile.debian-bookworm-hugo
+++ b/Dockerfile.debian-bookworm-hugo
@@ -6,5 +6,4 @@ RUN apt-get -qq update && \
apt-get -qq upgrade && \
apt-get -qq install hugo && \
apt-get -qq clean
-RUN ldconfig -v
RUN hugo version
--
GitLab
From cd05694fdb00f5510d318f5548b71785c3e13996 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 4 Apr 2025 20:32:02 +0200
Subject: [PATCH 4/6] Delete app cache according to hadolint
Otherwise we have an extra 100s of MBs of stale cache
---
Dockerfile.debian-bookworm-hugo | 5 +++--
Dockerfile.debian-trixie-hugo | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Dockerfile.debian-bookworm-hugo b/Dockerfile.debian-bookworm-hugo
index 39c4d94..45e7543 100644
--- a/Dockerfile.debian-bookworm-hugo
+++ b/Dockerfile.debian-bookworm-hugo
@@ -5,5 +5,6 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get -qq update && \
apt-get -qq upgrade && \
apt-get -qq install hugo && \
- apt-get -qq clean
-RUN hugo version
+ apt-get -qq clean && \
+ rm -rf /var/lib/apt/lists/* && \
+ hugo version
diff --git a/Dockerfile.debian-trixie-hugo b/Dockerfile.debian-trixie-hugo
index 9565b32..4610042 100644
--- a/Dockerfile.debian-trixie-hugo
+++ b/Dockerfile.debian-trixie-hugo
@@ -5,4 +5,5 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get -qq update && \
apt-get -qq upgrade && \
apt-get -qq install hugo && \
- apt-get -qq clean
+ apt-get -qq clean && \
+ rm -rf /var/lib/apt/lists/*
--
GitLab
From fd65c77fccfc6685aeb937da584929ccf103f923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 4 Apr 2025 20:32:27 +0200
Subject: [PATCH 5/6] Drop apt clean
which is called automatically
---
Dockerfile.debian-bookworm-hugo | 1 -
Dockerfile.debian-trixie-hugo | 1 -
2 files changed, 2 deletions(-)
diff --git a/Dockerfile.debian-bookworm-hugo b/Dockerfile.debian-bookworm-hugo
index 45e7543..2faf51e 100644
--- a/Dockerfile.debian-bookworm-hugo
+++ b/Dockerfile.debian-bookworm-hugo
@@ -5,6 +5,5 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get -qq update && \
apt-get -qq upgrade && \
apt-get -qq install hugo && \
- apt-get -qq clean && \
rm -rf /var/lib/apt/lists/* && \
hugo version
diff --git a/Dockerfile.debian-trixie-hugo b/Dockerfile.debian-trixie-hugo
index 4610042..9d8267f 100644
--- a/Dockerfile.debian-trixie-hugo
+++ b/Dockerfile.debian-trixie-hugo
@@ -5,5 +5,4 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get -qq update && \
apt-get -qq upgrade && \
apt-get -qq install hugo && \
- apt-get -qq clean && \
rm -rf /var/lib/apt/lists/*
--
GitLab
From a65e39d9cc388834428c80d97b5f79cdceae2cde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 4 Apr 2025 20:36:46 +0200
Subject: [PATCH 6/6] Run hugo version for good measure
---
Dockerfile.debian-trixie-hugo | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Dockerfile.debian-trixie-hugo b/Dockerfile.debian-trixie-hugo
index 9d8267f..5fee2f1 100644
--- a/Dockerfile.debian-trixie-hugo
+++ b/Dockerfile.debian-trixie-hugo
@@ -5,4 +5,5 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get -qq update && \
apt-get -qq upgrade && \
apt-get -qq install hugo && \
- rm -rf /var/lib/apt/lists/*
+ rm -rf /var/lib/apt/lists/* && \
+ hugo version
--
GitLab