From 194bedf9e93f8ecd3f442c144bc88666e8e88ea6 Mon Sep 17 00:00:00 2001
From: Wim <wim@42.be>
Date: Thu, 2 Dec 2021 00:42:46 +0100
Subject: [PATCH] Update to bullseye and git 2.34.1

bullseye is needed for newer OpenSSH which support ssh-signing using
ssh-keygen -Y sign

Needed for https://github.com/go-gitea/gitea/pull/17743
---
 Dockerfile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4b4d6a3..5523658 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.17-buster
+FROM golang:1.17-bullseye
 ARG GITEA_ID=1000
 ARG GITEA_GID=1000
 
@@ -12,14 +12,14 @@ RUN addgroup \
     --gid $GITEA_GID \
     gitea
 
-# upgrade git to v2.33.0
-RUN curl -SL https://github.com/git/git/archive/v2.33.0.tar.gz \
+# upgrade git to v2.34.1
+RUN curl -SL https://github.com/git/git/archive/v2.34.1.tar.gz \
     | tar -xzv -C /go \
     && apt-get update \
     && apt-get install -y libcurl4-gnutls-dev libexpat1-dev gettext libz-dev libssl-dev \
-    && make -C /go/git-2.33.0 prefix=/usr all \
-    && make -C /go/git-2.33.0 prefix=/usr install \
-    && rm -rf /go/git-2.33.0 \
+    && make -C /go/git-2.34.1 prefix=/usr all \
+    && make -C /go/git-2.34.1 prefix=/usr install \
+    && rm -rf /go/git-2.34.1 \
 # install git-lfs
     && curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash \
     && apt-get install -y git-lfs \