commit a974de954fbaf1cd856e2c91d48cc53d2799cbd4
author Luca Milanesio <luca.milanesio@gmail.com> Mon Nov 21 09:43:20 2022 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> Mon Nov 21 09:43:20 2022 +0000
tree dff26c70cdd61702501ad3ec67f9bc8d18da1bad
parent 7cb70eab5f5d1467bfa2ed419194450e231e249c
parent eece0a7112dd4ff9656deabe7019619c5d359b0a

Merge branch 'stable-3.4' into stable-3.5

* stable-3.4:
  Set Gerrit to 3.4.8-2

Change-Id: I9a376232f96325173155bc74e828c3e5bce32590

almalinux/8/Dockerfile

diff --git a/almalinux/8/Dockerfile b/almalinux/8/Dockerfile
index bfe9226..124380c 100644
--- a/almalinux/8/Dockerfile
+++ b/almalinux/8/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.5.4-1 && \
+    yum -y install gerrit-3.5.4-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

ubuntu/20/Dockerfile

diff --git a/ubuntu/20/Dockerfile b/ubuntu/20/Dockerfile
index 47264ee..a7e045d 100644
--- a/ubuntu/20/Dockerfile
+++ b/ubuntu/20/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.5.4-1 && \
+RUN apt-get -y install gerrit=3.5.4-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}/*' && \