Merge branch 'stable-3.7' into stable-3.8
* stable-3.7:
Set Gerrit to 3.7.7
Update Almalinux 8 GPG key
Change-Id: Ice13ed08cb75214cade99bacde9cc6f86d427947
diff --git a/README.md b/README.md
index 21a9e00..12326fd 100644
--- a/README.md
+++ b/README.md
@@ -1,56 +1,62 @@
-# Gerrit Code Review docker image
+# Gerrit Code Review docker images
-The official Gerrit Code Review image with an out-of-the-box setup
-with H2 and DEVELOPMENT account setup.
+These images provide official Gerrit Code Review releases using the
+DEB/RPM packages available from the
+[GerritForge repositories](https://gitenterprise.me/2015/02/27/gerrit-2-10-rpm-and-debian-packages-available/).
+The DEB/RPM packages contain the release `gerrit.war` file along with additional configuration files that
+provide an [out-of-the-box](https://gerrit.googlesource.com/plugins/out-of-the-box/) setup.
-This image is intended to be used AS-IS for training or staging environments.
-It can be used for production as base image and requires customizations to its gerrit.config
-and definition of persistent external modules.
+Each image is intended to be used AS-IS for training or staging environments.
+
+For production environments, the images provide a base on which required customizations
+to `gerrit.config` and persistent external modules can be made.
## Quickstart
-Start Gerrit Code Review in its demo/staging out-of-the-box setup:
+Start Gerrit Code Review in its demo/staging "out-of-the-box" setup like so:
```
-docker run -ti -p 8080:8080 -p 29418:29418 gerritcodereview/gerrit
+docker run -ti -p 8080:8080 -p 29418:29418 docker.io/gerritcodereview/gerrit
```
-Wait a few minutes until the ```Gerrit Code Review NNN ready``` message appears,
+Wait a few minutes until the `Gerrit Code Review NNN ready` message appears,
where NNN is your current Gerrit version, then open your browser to http://localhost:8080
and you will be in Gerrit Code Review.
-*NOTE*: If your docker server is running on a remote host, change 'localhost' to the hostname
-or IP address of your remote docker server.
+*NOTE*: If your docker server is running on a remote host, change 'localhost' to
+the hostname or IP address of your remote docker server.
-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).
+The [plugin-manager](https://gerrit.googlesource.com/plugins/plugin-manager/) introduction screen
+guides you through the basics of Gerrit and allows installation of 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.3.0 version.
+Images for previous Gerrit Code Review releases are available; e.g. to run version 3.8.0,
+use the following command:
```
-docker run -ti -p 8080:8080 -p 29418:29418 gerritcodereview/gerrit:3.3.0
+docker run -ti -p 8080:8080 -p 29418:29418 docker.io/gerritcodereview/gerrit:3.8.0
```
-## Build docker image
+## Build docker images
-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.3.0) is referenced in the
-Dockerfiles. To build such a docker image for development purposes, checkout the respective version
-tag, e.g.:
+To build docker images, clone the git repository https://gerrit.googlesource.com/docker-gerrit.
+
+Release tags are available and can be used to build particular releases. E.g. to build an
+image using Gerrit 3.8.0, checkout the respective tag:
```
-git checkout v3.3.0
+git checkout v3.8.0
```
-Navigate to either `./almalinux/8` or `./ubuntu/20` to build the almalinux- or ubuntu-based docker
-image, respectively. Then run:
+Navigate to either `./almalinux/9` or `./ubuntu/22` to build the almalinux- or ubuntu-based
+docker image. Then run:
```
docker build -t gerritcodereview/gerrit:$(git describe) .
```
-To build an image containing a development build of Gerrit, e.g. to test a change, run the following
-command instead:
+To build an image containing a development build of Gerrit (e.g. to test a change), run the
+following command instead:
```
docker build --build-arg GERRIT_WAR_URL="<url>" -t gerritcodereview/gerrit -f Dockerfile-dev .
@@ -64,7 +70,7 @@
For the official releases one can build both `amd64` and `arm64` images at once and either
load them to the local docker registry or push them to the `gerritcodereview` dockerhub account.
-In order to do that one simply calls:
+In order to do that, one simply calls:
```
./build_multiplatform.sh --load
@@ -76,7 +82,7 @@
./build_multiplatform.sh --push
```
-pushes images to the dockerhub instead.
+pushes images to docker-hub instead.
Notes:
* in the `--load` target only the current system architecture image is pushed to the local
@@ -86,17 +92,15 @@
## Using persistent volumes
Use docker persistent volumes to keep Gerrit data across restarts.
-See below a sample docker-compose.yaml per externally-mounted Lucene indexes,
+Below is a sample `docker-compose.yaml` with externally-mounted Lucene indexes,
Caches and Git repositories.
-Example of /docker-compose.yaml
-
```yaml
version: '3'
services:
gerrit:
- image: gerritcodereview/gerrit
+ image: docker.io/gerritcodereview/gerrit
volumes:
- git-volume:/var/gerrit/git
- index-volume:/var/gerrit/index
@@ -111,8 +115,16 @@
cache-volume:
```
+Run `docker compose up` (or `docker-compose up` with older versions of
+Docker) to trigger the build and execution of your container.
-Run ```docker-compose up``` to trigger the build and execution of your custom Gerrit docker setup.
+Note that the path `/var/gerrit/etc` may also be externally-mounted. If this is done, then
+the config file `/var/gerrit/etc/gerrit.config` initialized by the Gerrit DEB/RPM
+package inside the container will no longer be available. If gerrit does not find an existing
+`gerrit.config` file under the externally-mounted path, then it generates a new one. However, the
+newly generated config file does not provide the same first-run behaviour as the one from the
+DEB/RPM package (the out-of-the-box plugin is not configured, and the introductory screen of
+the plugin-manager will not appear).
## Environment variables
@@ -126,20 +138,19 @@
When running Gerrit on Docker in production, it is a good idea to rely on a physical external
storage with much better performance and reliability than the Docker's internal AUFS, and an external
-configuration directory for better change management traceability. Additionally,
-you may want to use a proper external authentication.
+configuration directory (`etc`) for better change management traceability. Additionally,
+you may want to use a proper external authentication (e.g. ldap).
-See below a more advanced example of docker-compose.yaml with OpenLDAP
-(from Osixia's DockerHub).
-
-Example of /docker-compose.yaml assuming you have an external directory available as /external/gerrit
+A more advanced `docker-compose.yaml` example is given below, which uses OpenLDAP
+(published by Osixia on Docker Hub). The example assumes you have an external directory
+available as `/external/gerrit`
```yaml
version: '3'
services:
gerrit:
- image: gerritcodereview/gerrit
+ image: docker.io/gerritcodereview/gerrit
ports:
- "29418:29418"
- "80:8080"
@@ -156,7 +167,7 @@
# command: init
ldap:
- image: osixia/openldap
+ image: docker.io/osixia/openldap
ports:
- "389:389"
- "636:636"
@@ -167,14 +178,14 @@
- /external/gerrit/ldap/etc:/etc/ldap/slapd.d
ldap-admin:
- image: osixia/phpldapadmin
+ image: docker.io/osixia/phpldapadmin
ports:
- "6443:443"
environment:
- PHPLDAPADMIN_LDAP_HOSTS=ldap
```
-Example of /external/gerrit/etc/gerrit.config
+Example of `/external/gerrit/etc/gerrit.config`
```
[gerrit]
@@ -211,7 +222,7 @@
user = root
```
-Example of /external/gerrit/etc/secure.config
+Example of `/external/gerrit/etc/secure.config`
```
[ldap]
password = secret
@@ -227,22 +238,22 @@
#### Step-1: Run Gerrit docker init setup from docker
-Uncomment the `command: init` option in docker-compose.yaml and run Gerrit with docker-compose
+Uncomment the `command: init` option in `docker-compose.yaml` and run Gerrit with `docker compose`
in foreground.
```
-docker-compose up gerrit
+docker compose up gerrit
```
-Wait until you see in the output the message ```Initialized /var/gerrit``` and then the container
+Wait until you see in the output the message `Initialized /var/gerrit` and then the container
will exit.
#### Step-2: Start Gerrit in daemon mode
-Comment out the `command: init` option 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 nodes:
```
-docker-compose up -d
+docker compose up -d
```
### Registering users in OpenLDAP with PhpLdapAdmin
@@ -255,7 +266,7 @@
#### Define the Gerrit administrator in OpenLDAP
-Login to PhpLdapAdmin using ```cn=admin,dc=example,dc=org``` as username and ```secret``` as password
+Login to PhpLdapAdmin using `cn=admin,dc=example,dc=org` as username and `secret` as password
and then create a new child node of type "Courier Mail Account" for the Gerrit Administrator
Example:
diff --git a/almalinux/8/Dockerfile b/almalinux/9/Dockerfile
similarity index 80%
rename from almalinux/8/Dockerfile
rename to almalinux/9/Dockerfile
index b5711c0..eec1134 100644
--- a/almalinux/8/Dockerfile
+++ b/almalinux/9/Dockerfile
@@ -1,9 +1,6 @@
-FROM almalinux:8.6
+FROM almalinux:9.1
MAINTAINER Gerrit Code Review Community
-# Update Almalinux GPG key - see https://almalinux.org/blog/2023-12-20-almalinux-8-key-update/
-RUN rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
-
# Add Gerrit packages repository
RUN rpm -i https://gerritforge.com/gerritforge-repo-1-4.noarch.rpm
@@ -13,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.7.7-1 && \
+ yum -y install gerrit-3.8.3-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
diff --git a/almalinux/8/Dockerfile-dev b/almalinux/9/Dockerfile-dev
similarity index 85%
rename from almalinux/8/Dockerfile-dev
rename to almalinux/9/Dockerfile-dev
index f2a6203..b928505 100644
--- a/almalinux/8/Dockerfile-dev
+++ b/almalinux/9/Dockerfile-dev
@@ -1,9 +1,6 @@
-FROM almalinux:8.6
+FROM almalinux:9.1
MAINTAINER Gerrit Code Review Community
-# Update Almalinux GPG key - see https://almalinux.org/blog/2023-12-20-almalinux-8-key-update/
-RUN rpm --import https://repo.almalinux.org/almalinux/RPM-GPG-KEY-AlmaLinux
-
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
diff --git a/almalinux/8/entrypoint.sh b/almalinux/9/entrypoint.sh
similarity index 100%
rename from almalinux/8/entrypoint.sh
rename to almalinux/9/entrypoint.sh
diff --git a/build_multiplatform.sh b/build_multiplatform.sh
index 944978f..c50fa8b 100755
--- a/build_multiplatform.sh
+++ b/build_multiplatform.sh
@@ -67,11 +67,11 @@
echo
echo "### Building almalinux multi-platform: [$PLATFORMS] iamges"
-(cd almalinux/8 && docker buildx build --platform "$PLATFORMS" --no-cache -t "$DOCKER_USER:${VERSION}-almalinux8" -t "$DOCKER_USER:$VERSION" "$DESTINATION" .)
+(cd almalinux/9 && docker buildx build --platform "$PLATFORMS" --no-cache -t "$DOCKER_USER:${VERSION}-almalinux9" -t "$DOCKER_USER:$VERSION" "$DESTINATION" .)
echo
echo "### Building ubuntu multi-platform: [$PLATFORMS] iamges"
-(cd ubuntu/20 && docker buildx build --platform "$PLATFORMS" --no-cache -t "$DOCKER_USER:${VERSION}-ubuntu20" "$DESTINATION" .)
+(cd ubuntu/22 && docker buildx build --platform "$PLATFORMS" --no-cache -t "$DOCKER_USER:${VERSION}-ubuntu22" "$DESTINATION" .)
echo
echo "### Removing multi-platform builder"
diff --git a/ubuntu/20/.dockerignore b/ubuntu/22/.dockerignore
similarity index 100%
rename from ubuntu/20/.dockerignore
rename to ubuntu/22/.dockerignore
diff --git a/ubuntu/20/Dockerfile b/ubuntu/22/Dockerfile
similarity index 94%
rename from ubuntu/20/Dockerfile
rename to ubuntu/22/Dockerfile
index 7d0fbfd..e49fdee 100644
--- a/ubuntu/20/Dockerfile
+++ b/ubuntu/22/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
MAINTAINER Gerrit Code Review Community
# Add Gerrit packages repository
@@ -16,7 +16,7 @@
# 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.7.7-1 && \
+RUN apt-get -y install gerrit=3.8.3-1 && \
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/20/Dockerfile-dev b/ubuntu/22/Dockerfile-dev
similarity index 98%
rename from ubuntu/20/Dockerfile-dev
rename to ubuntu/22/Dockerfile-dev
index d6ceead..e261a73 100644
--- a/ubuntu/20/Dockerfile-dev
+++ b/ubuntu/22/Dockerfile-dev
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.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"
diff --git a/ubuntu/20/entrypoint.sh b/ubuntu/22/entrypoint.sh
similarity index 100%
rename from ubuntu/20/entrypoint.sh
rename to ubuntu/22/entrypoint.sh
