Merge branch 'stable-2.13' into stable-2.14 * stable-2.13: Set Gerrit to 2.13.12 Add support for Gerrit 2.13.11 on ubuntu 14.04 and centos Change-Id: I878e8a5ef364c4b7ff0ebba7b933463f3adacf94
diff --git a/centos/7/Dockerfile b/centos/7/Dockerfile index a99e6d9..7658e67 100644 --- a/centos/7/Dockerfile +++ b/centos/7/Dockerfile
@@ -1,16 +1,15 @@ FROM centos:7.3.1611 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 # 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.7.0-openjdk -RUN yum -y install gerrit-2.13.12 +RUN yum -y install java-1.8.0-openjdk +RUN yum -y install gerrit-2.14.18 USER gerrit RUN java -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit
diff --git a/ubuntu/14/Dockerfile b/ubuntu/16/Dockerfile similarity index 82% rename from ubuntu/14/Dockerfile rename to ubuntu/16/Dockerfile index 1c12cb7..29d5ab3 100644 --- a/ubuntu/14/Dockerfile +++ b/ubuntu/16/Dockerfile
@@ -1,19 +1,18 @@ -FROM ubuntu:14.04 +FROM ubuntu:16.04 MAINTAINER Gerrit Code Review Community # Add Gerrit packages repository 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-7-jdk -RUN apt-get -y install gerrit=2.13.12-1 && rm -f /var/gerrit/logs/* +RUN apt-get -y install openjdk-8-jdk +RUN apt-get -y install gerrit=2.14.18-1 && rm -f /var/gerrit/logs/* USER gerrit RUN java -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit