Revert "hound: use updated git packages"
This reverts commit 3f2cc870b8
.
Upstream Debian has updated git to 2.30.2-1+deb11u1 which patches git
for the issues we manually patched to cover. We don't need the manual
patch anymore and can switch to the distro hence this revert.
Reviewers should double check that the image build process installs the
expected 2.30.2-1+deb11u1 version.
Change-Id: I6e6c817f078160412983e170abcaa9591a8daaa5
This commit is contained in:
parent
ef43cea2ff
commit
680252245f
@ -27,19 +27,6 @@ RUN pip install git+https://opendev.org/opendev/jeepyb#egg=jeepyb \
|
|||||||
RUN apt-get clean \
|
RUN apt-get clean \
|
||||||
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
|
||||||
|
|
||||||
# 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
|
|
||||||
|
|
||||||
ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
ADD supervisord.conf /etc/supervisor/conf.d/supervisord.conf
|
||||||
ADD start-container.sh /usr/bin/start-container
|
ADD start-container.sh /usr/bin/start-container
|
||||||
ADD update-hound-config.sh /usr/local/bin/update-hound-config
|
ADD update-hound-config.sh /usr/local/bin/update-hound-config
|
||||||
|
Loading…
Reference in New Issue
Block a user