Merge branch 'stable-3.7'
* stable-3.7:
Set Gerrit to 3.4.8-2
Set Gerrit to 3.5.4
Set Gerrit to 3.4.8
Set Gerrit to 3.4.7
follow-up to 'Upgrade almalinux image to version 8.6'
Change-Id: I089144f9aa85851ea95d278c6d750510399b211e
diff --git a/almalinux/9/Dockerfile b/almalinux/9/Dockerfile
index b2465fa..6c308be 100644
--- a/almalinux/9/Dockerfile
+++ b/almalinux/9/Dockerfile
@@ -2,7 +2,7 @@
MAINTAINER Gerrit Code Review Community
# Add Gerrit packages repository
-RUN rpm -i https://gerritforge.com/gerritforge-repo-1-2.noarch.rpm
+RUN rpm -i https://gerritforge.com/gerritforge-repo-1-4.noarch.rpm
ADD entrypoint.sh /
@@ -10,7 +10,7 @@
# (pre-trans Gerrit script needs to have access to the Java command)
RUN yum -y install initscripts && \
yum -y install java-11-openjdk && \
- yum -y install gerrit-3.7.0-1 && \
+ yum -y install gerrit-3.7.0-2 && \
/entrypoint.sh init && \
rm -f /var/gerrit/etc/{ssh,secure}* && rm -Rf /var/gerrit/{static,index,logs,data,index,cache,git,db,tmp}/* && chown -R gerrit:gerrit /var/gerrit && \
yum -y clean all
diff --git a/ubuntu/22/Dockerfile b/ubuntu/22/Dockerfile
index 6b29393..050fe00 100644
--- a/ubuntu/22/Dockerfile
+++ b/ubuntu/22/Dockerfile
@@ -16,7 +16,7 @@
# Install OpenJDK and Gerrit in two subsequent transactions
# (pre-trans Gerrit script needs to have access to the Java command)
RUN apt-get -y install openjdk-11-jdk
-RUN apt-get -y install gerrit=3.7.0-1 && \
+RUN apt-get -y install gerrit=3.7.0-2 && \
apt-mark hold gerrit && \
/entrypoint.sh init && \
bash -c 'rm -f /var/gerrit/etc/{ssh,secure}* && rm -Rf /var/gerrit/{static,index,logs,data,index,cache,git,db,tmp}/*' && \
