From 9ba2277a406120bb3e5166540e7b45a67a447110 Mon Sep 17 00:00:00 2001
From: ruowen <caiym@schbrain.com>
Date: Tue, 19 Mar 2019 07:26:18 +0800
Subject: [PATCH] upgrade gerrit to 2.15.11-1

Change-Id: If01ad38bc957453d146a437b42a3f98d6df31b57
---
 gerrit/Dockerfile   | 8 ++++----
 gerrit/sources.list | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gerrit/Dockerfile b/gerrit/Dockerfile
index 0a5d246..d6ca025 100644
--- a/gerrit/Dockerfile
+++ b/gerrit/Dockerfile
@@ -23,13 +23,12 @@ COPY sources.list /etc/apt/sources.list
 # Allow remote connectivity and sudo
 # Install OpenJDK and Gerrit in two subsequent transactions
 # (pre-trans Gerrit script needs to have access to the Java command)
-RUN echo "deb mirror://mirrorlist.gerritforge.com/deb gerrit contrib" > /etc/apt/sources.list.d/GerritForge.list && \
-    apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1871F775 && \
+RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1871F775 && \
     apt-get update && \
     apt-key update && \
     apt-get -y install openssh-client sudo && \
     apt-get -y install openjdk-8-jdk && \
-    apt-get -y install gerrit=2.15-1 && \
+    apt-get -y install gerrit=2.15.11-1 && \
     rm -f /var/gerrit/logs/* && \
     rm -rf /var/lib/apt/lists/*
 
@@ -37,7 +36,8 @@ COPY jre/java.security /usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.s
 
 USER gerrit
 RUN java -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit && \
-    java -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit
+    java -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit && \
+    git config -f /var/gerrit/etc/gerrit.config --add container.javaOptions "-Djava.security.egd=file:/dev/./urandom"
 
 ENV TZ=Asia/Shanghai
 ENV CANONICAL_WEB_URL=
diff --git a/gerrit/sources.list b/gerrit/sources.list
index 16d9236..058e36f 100644
--- a/gerrit/sources.list
+++ b/gerrit/sources.list
@@ -16,4 +16,4 @@ deb http://mirrors.aliyun.com/ubuntu/ xenial-security main restricted
 deb-src http://mirrors.aliyun.com/ubuntu/ xenial-security main restricted multiverse universe #Added by software-properties
 deb http://mirrors.aliyun.com/ubuntu/ xenial-security universe
 deb http://mirrors.aliyun.com/ubuntu/ xenial-security multiverse
-
+deb http://deb.gerritforge.com/ gerrit contrib
-- 
GitLab