Merge branch 'stable-3.1' into stable-3.2
* stable-3.1:
Set Gerrit to 3.1.12
Set Gerrit to 3.0.16
Set Gerrit to 2.16.26
Set Gerrit to 3.1.11
Set Gerrit to 3.0.15
Set Gerrit to 2.16.25
Set Gerrit to 3.1.10
Set Gerrit to 3.1.9
Set Gerrit to 3.0.14
Set Gerrit to 2.16.24
Set Gerrit to 2.16.23
Set Gerrit to 3.0.13
Change-Id: I0f9e4652cdf89a408aaaa40b1ab6927e8d3fd9be
diff --git a/README.md b/README.md
index 094bad6..736ae89 100644
--- a/README.md
+++ b/README.md
@@ -25,18 +25,24 @@
Starting from Ver. 2.14, a new introduction screen guides you through the basics of Gerrit
and allows installing additional plugins downloaded from [Gerrit CI](https://gerrit-ci.gerritforge.com).
+Official releases are also available as Docker images, e.g. use the following to run the 3.2.3 version.
+
+```
+docker run -ti -p 8080:8080 -p 29418:29418 gerritcodereview/gerrit:3.2.3
+```
+
## Build docker image
For docker images that contain released Gerrit versions, tags exist in this git repository pointing
-to a state of the repository, where this version of Gerrit (e.g. 3.0.0) is referenced in the
+to a state of the repository, where this version of Gerrit (e.g. 3.2.3) is referenced in the
Dockerfiles. To build such a docker image for development purposes, checkout the respective version
tag, e.g.:
```
-git checkout v3.0.0
+git checkout v3.2.3
```
-Navigate to either `./centos/7` or `./ubuntu/18` to build the centos- or ubuntu-based docker image,
+Navigate to either `./centos/8` or `./ubuntu/20` to build the centos- or ubuntu-based docker image,
respectively. Then run:
```
diff --git a/centos/7/entrypoint.sh b/centos/7/entrypoint.sh
deleted file mode 100755
index bf40fc8..0000000
--- a/centos/7/entrypoint.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash -e
-
-if [ ! -d /var/gerrit/git/All-Projects.git ] || [ "$1" == "init" ]
-then
- echo "Initializing Gerrit site ..."
- 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
- git config -f /var/gerrit/etc/gerrit.config --add container.javaOptions "-Djava.security.egd=file:/dev/./urandom"
-fi
-
-git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME}"
-if [ ${HTTPD_LISTEN_URL} ];
-then
- git config -f /var/gerrit/etc/gerrit.config httpd.listenUrl ${HTTPD_LISTEN_URL}
-fi
-
-if [ "$1" != "init" ]
-then
- echo "Running Gerrit ..."
- exec /var/gerrit/bin/gerrit.sh run
-fi
diff --git a/centos/7/.dockerignore b/centos/8/.dockerignore
similarity index 100%
rename from centos/7/.dockerignore
rename to centos/8/.dockerignore
diff --git a/centos/7/Dockerfile b/centos/8/Dockerfile
similarity index 78%
rename from centos/7/Dockerfile
rename to centos/8/Dockerfile
index 4950788..df72524 100644
--- a/centos/7/Dockerfile
+++ b/centos/8/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:7.7.1908
+FROM centos:8.1.1911
MAINTAINER Gerrit Code Review Community
# Add Gerrit packages repository
@@ -9,12 +9,15 @@
# 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-1.8.0-openjdk && \
- yum -y install gerrit-3.1.12-1 && \
+ yum -y install java-11-openjdk && \
+ yum -y install gerrit-3.2.6-1 && \
/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
+# Enable LEGACY security policies by default (for TLS 1.0/1.1 compatibility)
+RUN update-crypto-policies --set LEGACY
+
USER gerrit
ENV CANONICAL_WEB_URL=
diff --git a/centos/7/Dockerfile-dev b/centos/8/Dockerfile-dev
similarity index 94%
rename from centos/7/Dockerfile-dev
rename to centos/8/Dockerfile-dev
index dfba96d..d4ec95d 100644
--- a/centos/7/Dockerfile-dev
+++ b/centos/8/Dockerfile-dev
@@ -1,4 +1,4 @@
-FROM centos:7.6.1810
+FROM centos:8.1.1911
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"
@@ -6,10 +6,10 @@
# 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-client \
+ openssh-clients \
initscripts \
sudo \
- java-1.8.0-openjdk \
+ java-11-openjdk \
git && \
yum -y clean all
diff --git a/centos/8/entrypoint.sh b/centos/8/entrypoint.sh
new file mode 100755
index 0000000..1fc4530
--- /dev/null
+++ b/centos/8/entrypoint.sh
@@ -0,0 +1,25 @@
+#!/bin/bash -e
+
+export JAVA_OPTS='--add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang.invoke=ALL-UNNAMED'
+
+if [ ! -d /var/gerrit/git/All-Projects.git ] || [ "$1" == "init" ]
+then
+ echo "Initializing Gerrit site ..."
+ java $JAVA_OPTS -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit
+ java $JAVA_OPTS -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"
+ git config -f /var/gerrit/etc/gerrit.config --add container.javaOptions "--add-opens java.base/java.net=ALL-UNNAMED"
+ git config -f /var/gerrit/etc/gerrit.config --add container.javaOptions "--add-opens java.base/java.lang.invoke=ALL-UNNAMED"
+fi
+
+git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME}"
+if [ ${HTTPD_LISTEN_URL} ];
+then
+ git config -f /var/gerrit/etc/gerrit.config httpd.listenUrl ${HTTPD_LISTEN_URL}
+fi
+
+if [ "$1" != "init" ]
+then
+ echo "Running Gerrit ..."
+ exec /var/gerrit/bin/gerrit.sh run
+fi
diff --git a/ubuntu/18/entrypoint.sh b/ubuntu/18/entrypoint.sh
deleted file mode 100755
index bf40fc8..0000000
--- a/ubuntu/18/entrypoint.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash -e
-
-if [ ! -d /var/gerrit/git/All-Projects.git ] || [ "$1" == "init" ]
-then
- echo "Initializing Gerrit site ..."
- 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
- git config -f /var/gerrit/etc/gerrit.config --add container.javaOptions "-Djava.security.egd=file:/dev/./urandom"
-fi
-
-git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME}"
-if [ ${HTTPD_LISTEN_URL} ];
-then
- git config -f /var/gerrit/etc/gerrit.config httpd.listenUrl ${HTTPD_LISTEN_URL}
-fi
-
-if [ "$1" != "init" ]
-then
- echo "Running Gerrit ..."
- exec /var/gerrit/bin/gerrit.sh run
-fi
diff --git a/ubuntu/18/.dockerignore b/ubuntu/20/.dockerignore
similarity index 100%
rename from ubuntu/18/.dockerignore
rename to ubuntu/20/.dockerignore
diff --git a/ubuntu/18/Dockerfile b/ubuntu/20/Dockerfile
similarity index 90%
rename from ubuntu/18/Dockerfile
rename to ubuntu/20/Dockerfile
index e576e61..a090839 100644
--- a/ubuntu/18/Dockerfile
+++ b/ubuntu/20/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
MAINTAINER Gerrit Code Review Community
# Add Gerrit packages repository
@@ -15,8 +15,8 @@
# 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=3.1.12-1 && \
+RUN apt-get -y install openjdk-11-jdk
+RUN apt-get -y install gerrit=3.2.6-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
diff --git a/ubuntu/18/Dockerfile-dev b/ubuntu/20/Dockerfile-dev
similarity index 96%
rename from ubuntu/18/Dockerfile-dev
rename to ubuntu/20/Dockerfile-dev
index a0a35ae..5b8e50a 100644
--- a/ubuntu/18/Dockerfile-dev
+++ b/ubuntu/20/Dockerfile-dev
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu:20.04
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"
@@ -7,7 +7,7 @@
RUN apt-get update && apt-get -y install \
openssh-client \
sudo \
- openjdk-8-jdk \
+ openjdk-11-jdk \
git && \
rm -rf /var/lib/apt/lists/*
diff --git a/ubuntu/20/entrypoint.sh b/ubuntu/20/entrypoint.sh
new file mode 100755
index 0000000..1fc4530
--- /dev/null
+++ b/ubuntu/20/entrypoint.sh
@@ -0,0 +1,25 @@
+#!/bin/bash -e
+
+export JAVA_OPTS='--add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.lang.invoke=ALL-UNNAMED'
+
+if [ ! -d /var/gerrit/git/All-Projects.git ] || [ "$1" == "init" ]
+then
+ echo "Initializing Gerrit site ..."
+ java $JAVA_OPTS -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit
+ java $JAVA_OPTS -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"
+ git config -f /var/gerrit/etc/gerrit.config --add container.javaOptions "--add-opens java.base/java.net=ALL-UNNAMED"
+ git config -f /var/gerrit/etc/gerrit.config --add container.javaOptions "--add-opens java.base/java.lang.invoke=ALL-UNNAMED"
+fi
+
+git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME}"
+if [ ${HTTPD_LISTEN_URL} ];
+then
+ git config -f /var/gerrit/etc/gerrit.config httpd.listenUrl ${HTTPD_LISTEN_URL}
+fi
+
+if [ "$1" != "init" ]
+then
+ echo "Running Gerrit ..."
+ exec /var/gerrit/bin/gerrit.sh run
+fi
