Merge branch 'stable-3.2'
* stable-3.2:
Set Gerrit to 3.2.8
Set Gerrit to 3.1.13
Change-Id: Ieb34f56521f47f6fda5bf31d8b8affddc7da479c
diff --git a/README.md b/README.md
index 736ae89..dd72e68 100644
--- a/README.md
+++ b/README.md
@@ -25,21 +25,21 @@
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.
+Official releases are also available as Docker images, e.g. use the following to run the 3.3.0 version.
```
-docker run -ti -p 8080:8080 -p 29418:29418 gerritcodereview/gerrit:3.2.3
+docker run -ti -p 8080:8080 -p 29418:29418 gerritcodereview/gerrit:3.3.0
```
## 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.2.3) is referenced in the
+to a state of the repository, where this version of Gerrit (e.g. 3.3.0) is referenced in the
Dockerfiles. To build such a docker image for development purposes, checkout the respective version
tag, e.g.:
```
-git checkout v3.2.3
+git checkout v3.3.0
```
Navigate to either `./centos/8` or `./ubuntu/20` to build the centos- or ubuntu-based docker image,
@@ -130,7 +130,7 @@
- /external/gerrit/cache:/var/gerrit/cache
environment:
- CANONICAL_WEB_URL=http://localhost
- # entrypoint: /entrypoint.sh init
+ # command: init
ldap:
image: osixia/openldap
@@ -156,7 +156,6 @@
```
[gerrit]
basePath = git
- canonicalWebUrl = http://localhost
[index]
type = LUCENE
@@ -205,7 +204,7 @@
#### Step-1: Run Gerrit docker init setup from docker
-Uncomment in docker-compose.yaml the Gerrit init step entrypoint and run Gerrit with docker-compose
+Uncomment the `command: init` option in docker-compose.yaml and run Gerrit with docker-compose
in foreground.
```
@@ -217,7 +216,7 @@
#### Step-2: Start Gerrit in daemon mode
-Comment out the gerrit init entrypoint in docker-compose.yaml and start all the docker-compose nodes:
+Comment out the `command: init` option in docker-compose.yaml and start all the docker-compose nodes:
```
docker-compose up -d
diff --git a/centos/8/Dockerfile b/centos/8/Dockerfile
index b7cd3e4..a25f2c7 100644
--- a/centos/8/Dockerfile
+++ b/centos/8/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:8.1.1911
+FROM centos:8.2.2004
MAINTAINER Gerrit Code Review Community
# Add Gerrit packages repository
@@ -10,7 +10,7 @@
# (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.2.8-1 && \
+ yum -y install gerrit-3.3.2-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
@@ -28,4 +28,4 @@
VOLUME ["/var/gerrit/git", "/var/gerrit/index", "/var/gerrit/cache", "/var/gerrit/db", "/var/gerrit/etc"]
-ENTRYPOINT /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/centos/8/Dockerfile-dev b/centos/8/Dockerfile-dev
index d4ec95d..38677a1 100644
--- a/centos/8/Dockerfile-dev
+++ b/centos/8/Dockerfile-dev
@@ -33,4 +33,4 @@
VOLUME ["/var/gerrit/git", "/var/gerrit/index", "/var/gerrit/cache", "/var/gerrit/db", "/var/gerrit/etc"]
-ENTRYPOINT /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/ubuntu/20/Dockerfile b/ubuntu/20/Dockerfile
index f93d817..0545fe1 100644
--- a/ubuntu/20/Dockerfile
+++ b/ubuntu/20/Dockerfile
@@ -16,10 +16,11 @@
# 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.2.8-1 && \
+RUN apt-get -y install gerrit=3.3.2-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
+ bash -c '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
USER gerrit
@@ -31,4 +32,4 @@
VOLUME ["/var/gerrit/git", "/var/gerrit/index", "/var/gerrit/cache", "/var/gerrit/db", "/var/gerrit/etc"]
-ENTRYPOINT /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
diff --git a/ubuntu/20/Dockerfile-dev b/ubuntu/20/Dockerfile-dev
index 5b8e50a..d6ceead 100644
--- a/ubuntu/20/Dockerfile-dev
+++ b/ubuntu/20/Dockerfile-dev
@@ -31,4 +31,4 @@
VOLUME ["/var/gerrit/git", "/var/gerrit/index", "/var/gerrit/cache", "/var/gerrit/db", "/var/gerrit/etc"]
-ENTRYPOINT /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]
