Merge branch 'stable-3.8' * stable-3.8: Add trailing slash in default canonicalWebUrl Set Gerrit to 3.7.5 Set Gerrit to 3.6.7 Set Gerrit to 3.7.4 Set Gerrit to 3.6.6 Set Gerrit to 3.7.3 Set Gerrit to 3.6.5 Change-Id: I26731627508e3a70ec92734b8e1b4cb0c2cef42f
diff --git a/almalinux/9/Dockerfile b/almalinux/9/Dockerfile index e54b944..d661691 100644 --- a/almalinux/9/Dockerfile +++ b/almalinux/9/Dockerfile
@@ -1,4 +1,4 @@ -FROM almalinux:9.1 +FROM almalinux:9.2 MAINTAINER Gerrit Code Review Community # Add Gerrit packages repository @@ -9,8 +9,8 @@ # Install OS pre-prequisites, OpenJDK and Gerrit in two subsequent transactions # (pre-trans Gerrit script needs to have access to the Java command) RUN yum -y install initscripts && \ - yum -y install java-11-openjdk && \ - yum -y install gerrit-3.8.2-1 && \ + yum -y install java-17-openjdk && \ + yum -y install gerrit-3.9.0-0rc5 && \ /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 && \ yum -y clean all
diff --git a/almalinux/9/Dockerfile-dev b/almalinux/9/Dockerfile-dev index b928505..e350fb8 100644 --- a/almalinux/9/Dockerfile-dev +++ b/almalinux/9/Dockerfile-dev
@@ -1,15 +1,13 @@ -FROM almalinux:9.1 +FROM almalinux:9.2 MAINTAINER Gerrit Code Review Community -ARG GERRIT_WAR_URL="https://gerrit-ci.gerritforge.com/view/Gerrit/job/Gerrit-bazel-master/lastSuccessfulBuild/artifact/gerrit/bazel-bin/release.war" - # Allow remote connectivity and sudo and install OpenJDK and Git # (pre-trans Gerrit script needs to have access to the Java command) RUN yum -y install \ openssh-clients \ initscripts \ sudo \ - java-11-openjdk \ + java-17-openjdk \ git && \ yum -y clean all @@ -19,6 +17,7 @@ mkdir -p /var/gerrit/bin && \ chown -R gerrit /var/gerrit USER gerrit +ARG GERRIT_WAR_URL="https://gerrit-ci.gerritforge.com/view/Gerrit/job/Gerrit-bazel-master/lastSuccessfulBuild/artifact/gerrit/bazel-bin/release.war" ADD --chown=gerrit $GERRIT_WAR_URL /var/gerrit/bin/gerrit.war RUN mkdir -p /var/gerrit/etc && \ touch /var/gerrit/etc/gerrit.config && \
diff --git a/ubuntu/22/Dockerfile b/ubuntu/22/Dockerfile index 36bb69c..daf4f93 100644 --- a/ubuntu/22/Dockerfile +++ b/ubuntu/22/Dockerfile
@@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM eclipse-temurin:17-jammy MAINTAINER Gerrit Code Review Community # Add Gerrit packages repository @@ -13,10 +13,12 @@ ADD entrypoint.sh / -# 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-11-jdk -RUN apt-get -y install gerrit=3.8.2-1 && \ +# Note that temurin does everything that is needed in order to install JDK but doesn't +# update alternatives for java which is detected during the gerrit install step +# hence it is the only extra step that had to be added +RUN update-alternatives --install /usr/bin/java java $(which java) 2222 && \ + apt-get -y upgrade && \ + apt-get -y install gerrit=3.9.0-0rc5 && \ apt-mark hold gerrit && \ /entrypoint.sh init && \ bash -c 'rm -f /var/gerrit/etc/{ssh,secure}* && rm -Rf /var/gerrit/{static,index,logs,data,index,cache,git,db,tmp}/*' && \
diff --git a/ubuntu/22/Dockerfile-dev b/ubuntu/22/Dockerfile-dev index e261a73..86ee9e6 100644 --- a/ubuntu/22/Dockerfile-dev +++ b/ubuntu/22/Dockerfile-dev
@@ -1,13 +1,10 @@ -FROM ubuntu:22.04 +FROM eclipse-temurin:17-jammy MAINTAINER Gerrit Code Review Community -ARG GERRIT_WAR_URL="https://gerrit-ci.gerritforge.com/view/Gerrit/job/Gerrit-bazel-master/lastSuccessfulBuild/artifact/gerrit/bazel-bin/release.war" - # Install OpenJDK and Git and allow remote connectivity and sudo RUN apt-get update && apt-get -y install \ openssh-client \ sudo \ - openjdk-11-jdk \ git && \ rm -rf /var/lib/apt/lists/* @@ -17,6 +14,7 @@ mkdir -p /var/gerrit/bin && \ chown -R gerrit /var/gerrit USER gerrit +ARG GERRIT_WAR_URL="https://gerrit-ci.gerritforge.com/view/Gerrit/job/Gerrit-bazel-master/lastSuccessfulBuild/artifact/gerrit/bazel-bin/release.war" ADD --chown=gerrit $GERRIT_WAR_URL /var/gerrit/bin/gerrit.war RUN mkdir -p /var/gerrit/etc && \ touch /var/gerrit/etc/gerrit.config && \