Merge branch 'stable-2.15'
* stable-2.15:
Set Gerrit to 2.15.5
Set Gerrit to 2.14.15
Do not require openssh-clients
Upgrade to Gerrit version 2.15.4
Set Gerrit to 2.14.14
Set Gerrit to 2.14.13
Set Gerrit to 2.14.12
Set Gerrit to 2.14.11
Upgrade to Gerrit version 2.15.3
Set Gerrit to 2.14.10
Set Gerrit to v2.14.9
Upgrade to Gerrit version 2.15.2
Use /dev/urandom to speedup Server startup
Run reindex on Ubuntu 16
Set Gerrit to v2.14.8
Set Gerrit to v2.14.7
Set Gerrit to v2.14.6
Set Gerrit to v2.14.5.1
Set Gerrit to v2.14.4
Change-Id: I52a12d0e43daf2feb09725e855445e5296476a5b
diff --git a/centos/7/Dockerfile b/centos/7/Dockerfile
index 01e5af3..e4ef1c5 100644
--- a/centos/7/Dockerfile
+++ b/centos/7/Dockerfile
@@ -1,8 +1,7 @@
FROM centos:7.4.1708
MAINTAINER Gerrit Code Review Community
-# Allow remote connectivity and sudo
-RUN yum -y install openssh-client initscripts sudo
+RUN yum -y install initscripts sudo
# Add Gerrit packages repository
RUN rpm -i https://gerritforge.com/gerritforge-repo-1-2.noarch.rpm
@@ -10,11 +9,12 @@
# Install OpenJDK and Gerrit in two subsequent transactions
# (pre-trans Gerrit script needs to have access to the Java command)
RUN yum -y install java-1.8.0-openjdk
-RUN yum -y install gerrit-2.15.1-1 && rm -f /var/gerrit/logs/*
+RUN yum -y install gerrit-2.15.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
RUN java -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit
+RUN git config -f /var/gerrit/etc/gerrit.config container.javaOptions "-Djava.security.egd=file:/dev/./urandom"
ENV CANONICAL_WEB_URL=
@@ -26,4 +26,4 @@
# Start Gerrit
CMD git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME}" && \
git config -f /var/gerrit/etc/gerrit.config noteDb.changes.autoMigrate true && \
- /var/gerrit/bin/gerrit.sh run
\ No newline at end of file
+ /var/gerrit/bin/gerrit.sh run
diff --git a/ubuntu/16/Dockerfile b/ubuntu/16/Dockerfile
index 7405465..a90df96 100644
--- a/ubuntu/16/Dockerfile
+++ b/ubuntu/16/Dockerfile
@@ -5,19 +5,19 @@
RUN echo "deb mirror://mirrorlist.gerritforge.com/deb gerrit contrib" > /etc/apt/sources.list.d/GerritForge.list
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1871F775
-# Allow remote connectivity and sudo
RUN apt-get update
RUN apt-key update
-RUN apt-get -y install openssh-client sudo
+RUN apt-get -y install sudo
# 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.15.1-1 && rm -f /var/gerrit/logs/*
+RUN apt-get -y install gerrit=2.15.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
RUN java -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit
+RUN git config -f /var/gerrit/etc/gerrit.config container.javaOptions "-Djava.security.egd=file:/dev/./urandom"
ENV CANONICAL_WEB_URL=
