update git for CVE-2024-32002

ammolitor · ammolitor · commit 0f32c677dfab · 2024-05-23T15:36:56.000-05:00
diff --git a/docker/centos7/Dockerfile b/docker/centos7/Dockerfile
@@ -144,8 +144,8 @@ RUN source /opt/rh/devtoolset-${DEVTOOLSET_VERSION}/enable && \
 
 # build/install git
 RUN source /opt/rh/devtoolset-${DEVTOOLSET_VERSION}/enable && \
-    curl -Ls https://github.com/git/git/archive/v2.30.0.tar.gz -o git.tar.gz && \
-    echo "8db4edd1a0a74ebf4b78aed3f9e25c8f2a7db3c00b1aaee94d1e9834fae24e61  git.tar.gz" > git-sha.txt && \
+    curl -Ls https://github.com/git/git/archive/refs/tags/v2.45.1.tar.gz -o git.tar.gz && \
+    echo "d98c8f70d58f49f7546d59b25e25f2deae6999eb036a33b0fe6f5d07c33f67c6  git.tar.gz" > git-sha.txt && \
     sha256sum --quiet -c git-sha.txt && \
     mkdir git && \
     tar --strip-components 1 --no-same-owner --directory git -xf git.tar.gz && \
diff --git a/docker/rockylinux9/Dockerfile b/docker/rockylinux9/Dockerfile
@@ -41,7 +41,6 @@ RUN dnf install -y  --enablerepo devel --allowerasing \
         wget \
         zlib-devel \
         gcc-c++ \
-        git \
         libstdc++-static \
         libunwind \
         libunwind-devel \
@@ -120,6 +119,20 @@ RUN curl -Ls https://github.com/axboe/liburing/archive/refs/tags/liburing-2.1.ta
     cd ../ && \
     rm -rf /tmp/*
 
+# build/install git
+RUN curl -Ls https://github.com/git/git/archive/refs/tags/v2.45.1.tar.gz -o git.tar.gz && \
+    echo "d98c8f70d58f49f7546d59b25e25f2deae6999eb036a33b0fe6f5d07c33f67c6  git.tar.gz" > git-sha.txt && \
+    sha256sum --quiet -c git-sha.txt && \
+    mkdir git && \
+    tar --strip-components 1 --no-same-owner --directory git -xf git.tar.gz && \
+    cd git && \
+    make configure && \
+    ./configure && \
+    make && \
+    make install && \
+    cd ../ && \
+    rm -rf /tmp/*
+
 # build/install ninja
 RUN curl -Ls https://github.com/ninja-build/ninja/archive/refs/tags/v1.10.2.zip -o ninja.zip && \
     echo "4e7b67da70a84084d5147a97fcfb867660eff55cc60a95006c389c4ca311b77d  ninja.zip" > ninja-sha.txt && \
