From 05eb3776bb7893cced7e1eda152374bb0f794b6e Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 30 Jan 2023 12:29:59 +1100 Subject: [PATCH] Revert "Update git" This reverts commit 938d28abe820cb9164c2f9765386c2354ecc374d. The upstream version is released, so this now causes build failures due to trying to downgrade the package. Change-Id: Ibdba6c3332a08691a9a412e5849cb7377c0ec27f --- Dockerfile | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index a7200a851..a882d4c84 100644 --- a/Dockerfile +++ b/Dockerfile @@ -117,19 +117,6 @@ RUN \ apt-get clean \ && rm -rf /var/lib/apt/lists/* -# 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 - # NOTE(ianw) 2022-08-02 : move this into its own cgroup on cgroupsv2 # hosts for nested podman calls to work; see comments in # https://github.com/containers/podman/issues/14884