Merge branch 'stable-3.10' * stable-3.10: Set Gerrit to 3.10.5 Set Gerrit to 3.9.10 Update GerritForge's GPG key for RPM/DEB packages Set Gerrit to v3.10.4 Set Gerrit to 3.9.9 Set Gerrit to v3.10.3 Set Gerrit to 3.9.8 Set Gerrit to 3.9.7 Set Gerrit to 3.9.6 Set Gerrit to 3.9.5 Set Gerrit to 3.9.4 Set Gerrit to 3.9.3 Change-Id: I5d9db285fc832515dbf0ca21fd7a4a273bb7a415
diff --git a/almalinux/9/Dockerfile b/almalinux/9/Dockerfile index 1f569cc..0501adc 100644 --- a/almalinux/9/Dockerfile +++ b/almalinux/9/Dockerfile
@@ -1,8 +1,9 @@ FROM almalinux:9.4 LABEL org.opencontainers.image.authors="luca.milanesio@gmail.com" -# Add Gerrit packages repository +# 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' ADD entrypoint.sh /
diff --git a/ubuntu/24/Dockerfile b/ubuntu/24/Dockerfile index 5319728..29c5ed7 100644 --- a/ubuntu/24/Dockerfile +++ b/ubuntu/24/Dockerfile
@@ -5,7 +5,7 @@ RUN apt-get update && \ apt-get -y install gnupg2 RUN echo "deb mirror://mirrorlist.gerritforge.com/bionic gerrit contrib" > /etc/apt/sources.list.d/GerritForge.list -RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 847005AE619067D5 +RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 55787ed781304950 RUN apt-get update RUN apt-key update