Revert "Update git"
This reverts commit 938d28abe8
.
The upstream version is released, so this now causes build failures
due to trying to downgrade the package.
Change-Id: Ibdba6c3332a08691a9a412e5849cb7377c0ec27f
This commit is contained in:
parent
ad7bf9aaeb
commit
05eb3776bb
13
Dockerfile
13
Dockerfile
|
@ -117,19 +117,6 @@ RUN \
|
||||||
apt-get clean \
|
apt-get clean \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& 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
|
# NOTE(ianw) 2022-08-02 : move this into its own cgroup on cgroupsv2
|
||||||
# hosts for nested podman calls to work; see comments in
|
# hosts for nested podman calls to work; see comments in
|
||||||
# https://github.com/containers/podman/issues/14884
|
# https://github.com/containers/podman/issues/14884
|
||||||
|
|
Loading…
Reference in New Issue