From f1cc7d4f8e820de492e4b66f267f5563278741f1 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Thu, 5 Oct 2023 10:59:24 -0700
Subject: [PATCH] Update gitea base OS during image builds

This ensures we're always up to date with our packages even if the
upstream container images lag behind debian proper. Useful for pulling
in bugfixes more quickly than upstream seems to think we want them.

Change-Id: Ia7ec97ca17ad1175c8ddd4c5d037f516dcdd891a
---
 docker/gitea/Dockerfile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile
index 8351f8bc0b..afe29727e7 100644
--- a/docker/gitea/Dockerfile
+++ b/docker/gitea/Dockerfile
@@ -33,7 +33,9 @@ ARG GITEA_VERSION="v1.20.4"
 ENV TAGS "bindata $TAGS"
 
 #Build deps
-RUN apt-get update && apt-get -y install build-essential git apt-transport-https curl gnupg2 \
+RUN apt-get update \
+  && apt-get -y dist-upgrade \
+  && apt-get -y install build-essential git apt-transport-https curl gnupg2 \
   && curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
   && echo "deb https://deb.nodesource.com/node_20.x bookworm main" | tee /etc/apt/sources.list.d/nodesource.list \
   && apt-get update \
@@ -64,7 +66,9 @@ RUN chmod 755 gitea \
 
 FROM docker.io/library/debian:bookworm-slim as base
 
-RUN apt-get update && apt-get -y install \
+RUN apt-get update \
+  && apt-get -y dist-upgrade \
+  && apt-get -y install \
     bash \
     ca-certificates \
     curl \