From 6de5a76aaff75581d2497e55cecc865f113aaa78 Mon Sep 17 00:00:00 2001
From: Clark Boylan <clark.boylan@gmail.com>
Date: Mon, 30 Jan 2023 11:16:06 -0800
Subject: [PATCH] Flip Gerrit image to install distro git
This stops us installing our locally patched git package and shifts to
installing git from debian bullseye. This should pull in git
2.30.2-1+deb11u1 which includes the same patches we made but in the
upstream package.
Reviewers should double check this correct up to date version of git is
installed in the image build.
Note we don't do a straight revert because we need to explicitly install
git to upgrade git on the base image as it has not updated yet.
Change-Id: I34b170f59bc648a8917176ded66ffaea9425c4b9
---
docker/gerrit/base/Dockerfile | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
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