Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
Prevent automatic upgrade of Gerrit package
Change-Id: I64dfdf2703004023aa95eb8a5aede618b1f7efde
diff --git a/ubuntu/18/Dockerfile b/ubuntu/18/Dockerfile
index 44ee658..55a5c20 100644
--- a/ubuntu/18/Dockerfile
+++ b/ubuntu/18/Dockerfile
@@ -17,6 +17,7 @@
# (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=3.0.7-1 && \
+ apt-mark hold gerrit && \
/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
