Merge branch 'stable-3.11'

* stable-3.11:
  Set Gerrit to 3.11.5
  Set Gerrit to 3.10.8

Change-Id: Ie73edcff58012160779b555c562f8042d839b683

almalinux/9/Dockerfile

diff --git a/almalinux/9/Dockerfile b/almalinux/9/Dockerfile
index 2236bb6..84d5fcc 100644
--- a/almalinux/9/Dockerfile
+++ b/almalinux/9/Dockerfile
@@ -1,9 +1,8 @@
-FROM almalinux:9.4
+FROM almalinux:9.5
 LABEL org.opencontainers.image.authors="luca.milanesio@gmail.com"
 
 # Add Gerrit packages repository and the newest GPG key
-RUN rpm -i https://gerritforge.com/gerritforge-repo-1-4.noarch.rpm
-RUN rpm --import 'https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x72adb205736d7147da56e8c955787ed781304950'
+RUN rpm -i https://gerritforge.com/gerritforge-repo-1-5.noarch.rpm
 
 ADD entrypoint.sh /
 
@@ -12,7 +11,7 @@
 RUN yum -y install initscripts && \
     yum -y install java-21-openjdk
 
-RUN yum -y install gerrit-3.11.5-1 && \
+RUN yum -y install gerrit-3.12.1-1 && \
     /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/24/Dockerfile

diff --git a/ubuntu/24/Dockerfile b/ubuntu/24/Dockerfile
index 7f5899c..9f87d92 100644
--- a/ubuntu/24/Dockerfile
+++ b/ubuntu/24/Dockerfile
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21.0.5_11-jdk-noble
+FROM eclipse-temurin:21.0.6_7-jdk-noble
 LABEL org.opencontainers.image.authors="luca.milanesio@gmail.com"
 
 # Add Gerrit packages repository
@@ -18,7 +18,7 @@
 # hence it is the only extra step that had to be added
 RUN update-alternatives --install /usr/bin/java java $(which java) 2222 && \
     apt-get -y upgrade && \
-    apt-get -y install gerrit=3.11.5-1 && \
+    apt-get -y install gerrit=3.12.1-1 && \
     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}/*' && \