Set Gerrit to 3.4.8-2
The packaging release 2 includes fixes on the
Gerrit pre-requisites:
- sudo
- Java 11
Also update the GerritForge's RPM repo to gerritforge-repo-1-4
for getting ARM64 architecture support.
Change-Id: I70fc8f14dd0a499b92b78cd736cf18f9a45d544d
diff --git a/almalinux/8/Dockerfile b/almalinux/8/Dockerfile
index ded920e..47712eb 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.4.8-1 && \
+ yum -y install gerrit-3.4.8-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 01a25ef..dee85e2 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.4.8-1 && \
+RUN apt-get -y install gerrit=3.4.8-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}/*' && \
