commit e6ca0fa3203db4c2bab736c806034fe0e3df65eb
author Luca Milanesio <luca.milanesio@gmail.com> Sat Feb 09 23:07:42 2019 +0000
committer Luca Milanesio <luca.milanesio@gmail.com> Sat Feb 09 23:07:57 2019 +0000
tree c902c37f2682bbf54b32ec79202007a5aa7c5963
parent 3234b740f978de489bc4cf34ae9fa79db5836b8c
parent b3f48d48ba3244db4d1038d46f16f45327dc8f72

Merge branch 'stable-2.16'

* stable-2.16:
  Set Gerrit to 2.16.5
  Set Gerrit to 2.15.10
  Set Gerrit to 2.15.9
  Set Gerrit to 2.13.12
  Set Gerrit to 2.14.18
  Set Gerrit to 2.15.8
  Set Gerrit to 2.15.7
  Set Gerrit to 2.14.17
  Set Gerrit to 2.15.6
  Set Gerrit to 2.14.16
  Upgrade CentOS to 7.5.1804
  Add support for Gerrit 2.13.11 on ubuntu 14.04 and centos

Change-Id: Id55d32c2dc001ee190665f5a80b8ada03dc06465

centos/7/Dockerfile

diff --git a/centos/7/Dockerfile b/centos/7/Dockerfile
index 129f224..504de4a 100644
--- a/centos/7/Dockerfile
+++ b/centos/7/Dockerfile
@@ -8,7 +8,7 @@
 # (pre-trans Gerrit script needs to have access to the Java command)
 RUN yum -y install initscripts && \
     yum -y install java-1.8.0-openjdk && \
-    yum -y install gerrit-2.16.4-2  && rm -Rf /var/gerrit/{logs,tmp}/* && rm -Rf /var/gerrit/.gerritcodereview && \
+    yum -y install gerrit-2.16.5-1  && rm -Rf /var/gerrit/{logs,tmp}/* && rm -Rf /var/gerrit/.gerritcodereview && \
     yum -y clean all
 
 USER gerrit

ubuntu/16/Dockerfile

diff --git a/ubuntu/16/Dockerfile b/ubuntu/16/Dockerfile
index 4c180bb..21121c0 100644
--- a/ubuntu/16/Dockerfile
+++ b/ubuntu/16/Dockerfile
@@ -12,7 +12,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-8-jdk
-RUN apt-get -y install gerrit=2.16.4-2 && rm -f /var/gerrit/logs/*
+RUN apt-get -y install gerrit=2.16.5-1 && rm -f /var/gerrit/logs/*
 
 USER gerrit
 RUN java -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit