From 023a1acc6dc8cb70999c5f138051fa586b5547ae Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 20 Jan 2023 11:45:37 +1100
Subject: [PATCH] gerrit: update git

Pull in updated git packages to address CVE-2022-23521.

This is a direct copy of work done in
Ib08ff1fc7b3c8623fa6b927f3010af72e1b946cf

git is included from the openjdk base image

Change-Id: Ia219a2485d166bc192f2172b56a076c94de38e0c
---
 docker/gerrit/base/Dockerfile | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile
index 2e5c65dc26..b8672f977f 100644
--- a/docker/gerrit/base/Dockerfile
+++ b/docker/gerrit/base/Dockerfile
@@ -45,6 +45,19 @@ RUN addgroup gerrit --gid 3000 --system \
     --ingroup gerrit \
     gerrit
 
+# Begin temporary git package upgrade
+RUN ARCH=`dpkg --print-architecture` \
+    && cd /tmp \
+    && apt-get update \
+    && apt-get -y install wget \
+    && wget https://static.opendev.org/project/opendev.org/debs/git/git_2.30.2-1opendev1.0_$ARCH.deb \
+    && wget https://static.opendev.org/project/opendev.org/debs/git/git-man_2.30.2-1opendev1.0_all.deb \
+    && apt-get -y install /tmp/git_*.deb /tmp/git-man_*.deb \
+    && rm -f /tmp/*.deb \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+# End temporary git package upgrade
+
 # Startup scripts
 COPY wait-for-it.sh /wait-for-it.sh
 RUN chmod +x /wait-for-it.sh