From 944b9852c9f565ec433a808385d4ed0ad3f0abcc Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Wed, 18 Jan 2023 15:37:47 -0800
Subject: Update git

This updates git to address CVE-2022-23521.

Change-Id: Ib08ff1fc7b3c8623fa6b927f3010af72e1b946cf
Co-Authored-By: Jeremy Stanley <fungi@yuggoth.org>
Co-Authored-By: Clark Boylan <clark.boylan@gmail.com>
---
 Dockerfile | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Dockerfile b/Dockerfile
index 5c10fe269..51d28c0fb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -60,6 +60,19 @@ RUN /output/install-from-bindep zuul_base \
 # where it becomes the default.
   && git config --system protocol.version 2
 
+# 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
+
 VOLUME /var/lib/zuul
 CMD ["/usr/local/bin/zuul"]
 
-- 
cgit v1.2.1