Merge branch 'stable-3.5' into stable-3.6
* stable-3.5:
Set Gerrit to 3.5.5
Change-Id: I1175ee418e3bf478a6dba5e3d0aba4227850eccd
diff --git a/almalinux/8/Dockerfile b/almalinux/8/Dockerfile
index d7bbedb..376ba35 100644
--- a/almalinux/8/Dockerfile
+++ b/almalinux/8/Dockerfile
@@ -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.5-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
diff --git a/ubuntu/20/Dockerfile b/ubuntu/20/Dockerfile
index 7bd4fba..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.5.5-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}/*' && \
