From 3fdec9d20f64e1e48472aca8971b38c9797740d4 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 27 Dec 2021 11:41:56 -0800 Subject: [PATCH] Update Gerrit images to 3.3.9 and 3.4.3 This includes the fixes for right to left unicode that we've already picked up, but now in an official release. It also updates Elasticsearch support to prevent use with elasticsearch versions that are vulnerable to log4shell. We don't use elasticsearch with Gerrit so this doesn't affect us. Change-Id: Ifbba7391bd16bc20c003293030a71e0ea787d0c7 --- docker/gerrit/base/Dockerfile | 2 +- zuul.d/docker-images/gerrit.yaml | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docker/gerrit/base/Dockerfile b/docker/gerrit/base/Dockerfile index 9bfe9f4dac..f4fbbcc86e 100644 --- a/docker/gerrit/base/Dockerfile +++ b/docker/gerrit/base/Dockerfile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -# Fri Dec 10 17:21:05 UTC 2021 - trigger rebuild +# Mon Dec 27 19:33:56 UTC 2021 - trigger rebuild FROM docker.io/opendevorg/python-builder:3.9-bullseye as builder diff --git a/zuul.d/docker-images/gerrit.yaml b/zuul.d/docker-images/gerrit.yaml index 409ee0e632..a31aa31ca3 100644 --- a/zuul.d/docker-images/gerrit.yaml +++ b/zuul.d/docker-images/gerrit.yaml @@ -57,9 +57,9 @@ override-checkout: stable-3.3 # Plugins common to every build with branches or refs for every build - name: gerrit.googlesource.com/plugins/commit-message-length-validator - override-checkout: v3.3.8 + override-checkout: v3.3.9 - name: gerrit.googlesource.com/plugins/hooks - override-checkout: v3.3.8 + override-checkout: v3.3.9 - name: gerrit.googlesource.com/plugins/its-base # There is no 3.3 branch override-checkout: master @@ -69,21 +69,21 @@ - name: gerrit.googlesource.com/plugins/replication override-checkout: stable-3.3 - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: v3.3.8 + override-checkout: v3.3.9 # Plugins common to every build without branches or refs for every build - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: v3.3.8 + override-checkout: v3.3.9 - name: gerrit.googlesource.com/plugins/singleusergroup override-checkout: stable-3.3 # Plugins not common to every build - name: gerrit.googlesource.com/plugins/codemirror-editor override-checkout: stable-3.3 - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: v3.3.8 + override-checkout: stable-3.3 - name: gerrit.googlesource.com/plugins/gitiles override-checkout: stable-3.3 - name: gerrit.googlesource.com/plugins/plugin-manager - override-checkout: v3.3.8 + override-checkout: v3.3.9 - name: gerrit.googlesource.com/plugins/webhooks override-checkout: stable-3.3 - name: gerrit.googlesource.com/plugins/zuul-results-summary @@ -92,7 +92,7 @@ - name: gerrit.googlesource.com/jgit override-checkout: master - name: gerrit.googlesource.com/polymer-bridges - override-checkout: v3.3.8 + override-checkout: v3.3.9 vars: &gerrit_vars_3_3 docker_images: - context: docker/gerrit/bazel @@ -149,9 +149,9 @@ override-checkout: stable-3.4 # Plugins common to every build with branches or refs for every build - name: gerrit.googlesource.com/plugins/commit-message-length-validator - override-checkout: v3.4.2 + override-checkout: v3.4.3 - name: gerrit.googlesource.com/plugins/hooks - override-checkout: v3.4.2 + override-checkout: v3.4.3 - name: gerrit.googlesource.com/plugins/its-base # There is no 3.4 branch override-checkout: master @@ -161,21 +161,21 @@ - name: gerrit.googlesource.com/plugins/replication override-checkout: stable-3.4 - name: gerrit.googlesource.com/plugins/reviewnotes - override-checkout: v3.4.2 + override-checkout: v3.4.3 # Plugins common to every build without branches or refs for every build - name: gerrit.googlesource.com/plugins/download-commands - override-checkout: v3.4.2 + override-checkout: v3.4.3 - name: gerrit.googlesource.com/plugins/singleusergroup - override-checkout: v3.4.2 + override-checkout: v3.4.3 # Plugins not common to every build - name: gerrit.googlesource.com/plugins/codemirror-editor override-checkout: stable-3.4 - name: gerrit.googlesource.com/plugins/delete-project - override-checkout: v3.4.2 + override-checkout: stable-3.4 - name: gerrit.googlesource.com/plugins/gitiles override-checkout: stable-3.4 - name: gerrit.googlesource.com/plugins/plugin-manager - override-checkout: v3.4.2 + override-checkout: v3.4.3 - name: gerrit.googlesource.com/plugins/webhooks override-checkout: stable-3.4 - name: gerrit.googlesource.com/plugins/zuul-results-summary @@ -184,7 +184,7 @@ - name: gerrit.googlesource.com/jgit override-checkout: master - name: gerrit.googlesource.com/polymer-bridges - override-checkout: v3.4.2 + override-checkout: v3.4.3 vars: &gerrit_vars_3_4 docker_images: - context: docker/gerrit/bazel