diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile index b8672f977f..61dd2e229e 100644 --- a/docker/gerrit/base/Dockerfile +++ b/docker/gerrit/base/Dockerfile @@ -25,7 +25,7 @@ FROM docker.io/library/openjdk:11-bullseye as gerrit-base RUN echo 'APT::Install-Recommends "0";' > /etc/apt/apt.conf.d/95disable-recommends RUN apt-get update \ - && apt-get install -y dumb-init python3-launchpadlib python3-distutils unzip \ + && apt-get install -y dumb-init git python3-launchpadlib python3-distutils unzip \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ && curl https://bootstrap.pypa.io/get-pip.py > /tmp/get-pip.py \ @@ -45,19 +45,6 @@ RUN addgroup gerrit --gid 3000 --system \ --ingroup gerrit \ gerrit -# 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 - # Startup scripts COPY wait-for-it.sh /wait-for-it.sh RUN chmod +x /wait-for-it.sh