summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames E. Blair <jim@acmegating.com>2023-01-18 15:37:47 -0800
committerJames E. Blair <jim@acmegating.com>2023-01-18 15:37:47 -0800
commit944b9852c9f565ec433a808385d4ed0ad3f0abcc (patch)
tree1e0d4aec732c3e2a1afdb5b6884df31af67e6c0f
parent7dbfef6e1c1c92a7bfa5c9c9890b6ad802e6adce (diff)
downloadzuul-944b9852c9f565ec433a808385d4ed0ad3f0abcc.tar.gz
Update git8.1.0
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>
-rw-r--r--Dockerfile13
1 files changed, 13 insertions, 0 deletions
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"]