Merge branch 'stable-3.9' into stable-3.10 * stable-3.9: Set Gerrit to 3.9.11 Change-Id: Ic65bd5761a040560c5b7af342787d473d42159d9
diff --git a/almalinux/9/Dockerfile b/almalinux/9/Dockerfile index c3ba436..a749a2f 100644 --- a/almalinux/9/Dockerfile +++ b/almalinux/9/Dockerfile
@@ -1,4 +1,4 @@ -FROM almalinux:9.2 +FROM almalinux:9.4 MAINTAINER Gerrit Code Review Community # Add Gerrit packages repository and the newest GPG key @@ -11,7 +11,7 @@ # (pre-trans Gerrit script needs to have access to the Java command) RUN yum -y install initscripts && \ yum -y install java-17-openjdk && \ - yum -y install gerrit-3.9.11-1 && \ + yum -y install gerrit-3.10.5-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
diff --git a/almalinux/9/Dockerfile-dev b/almalinux/9/Dockerfile-dev index e350fb8..e9b27ba 100644 --- a/almalinux/9/Dockerfile-dev +++ b/almalinux/9/Dockerfile-dev
@@ -1,4 +1,4 @@ -FROM almalinux:9.2 +FROM almalinux:9.4 MAINTAINER Gerrit Code Review Community # Allow remote connectivity and sudo and install OpenJDK and Git
diff --git a/ubuntu/22/Dockerfile b/ubuntu/22/Dockerfile index 0f1dbe1..6f6bd63 100644 --- a/ubuntu/22/Dockerfile +++ b/ubuntu/22/Dockerfile
@@ -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.9.11-1 && \ + apt-get -y install gerrit=3.10.5-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}/*' && \