commit 728bc4da8534c1a07944bd64d54a60e0e71c0f41
author Luca Milanesio <luca.milanesio@gmail.com> Mon Nov 21 10:47:02 2022 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> Mon Nov 21 10:47:02 2022 +0000
tree da2b798db35c75b660c217ad59b561f7ae3e7634
parent 5c10dd21219af0fb30bccfa49b40248a82ca7072
parent a974de954fbaf1cd856e2c91d48cc53d2799cbd4

Merge branch 'stable-3.5' into stable-3.6

* stable-3.5:
  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: I6e58a607e278381e643f27aac5362b9b95f81b0b

almalinux/8/Dockerfile

diff --git a/almalinux/8/Dockerfile b/almalinux/8/Dockerfile
index cfa1eeb..376ba35 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.6.3-1 && \
+    yum -y install gerrit-3.6.3-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

almalinux/8/Dockerfile-dev

diff --git a/almalinux/8/Dockerfile-dev b/almalinux/8/Dockerfile-dev
index 0b73848..33ccee3 100644
--- a/almalinux/8/Dockerfile-dev
+++ b/almalinux/8/Dockerfile-dev
@@ -1,4 +1,4 @@
-FROM almalinux:8.5
+FROM almalinux:8.6
 MAINTAINER Gerrit Code Review Community
 
 ARG GERRIT_WAR_URL="https://gerrit-ci.gerritforge.com/view/Gerrit/job/Gerrit-bazel-master/lastSuccessfulBuild/artifact/gerrit/bazel-bin/release.war"

ubuntu/20/Dockerfile

diff --git a/ubuntu/20/Dockerfile b/ubuntu/20/Dockerfile
index dae0628..90f23f4 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.6.3-1 && \
+RUN apt-get -y install gerrit=3.6.3-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}/*' && \