Merge "Add Dockerfiles with development versions of Gerrit"
diff --git a/.github/ISSUE_TEMPLATE/raising-issues.md b/.github/ISSUE_TEMPLATE/raising-issues.md
new file mode 100644
index 0000000..b620214
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/raising-issues.md
@@ -0,0 +1,14 @@
+---
+name: Raising issues
+about: Important Notice on how to raise issues
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Issues submission is done through [Gerrit Issue Tracker](https://bugs.chromium.org/p/gerrit/issues/list).
+Unfortunately, we cannot accept or follow-up issues raised on GitHub.
+This is a read-only project replica and is not monitored on a regular basis.
+
+Thank you in advance for your understanding.
diff --git a/README.md b/README.md
index d2cb930..e5eb1b0 100644
--- a/README.md
+++ b/README.md
@@ -57,8 +57,8 @@
## Using persistent volumes
Use docker persistent volumes to keep Gerrit data across restarts.
-See below a sample docker-compose.yaml for persisting the H2 Database, Lucene indexes, Caches and
-Git repositories.
+See below a sample docker-compose.yaml per externally-mounted Lucene indexes,
+Caches and Git repositories.
Example of /docker-compose.yaml
@@ -70,7 +70,6 @@
image: gerritcodereview/gerrit
volumes:
- git-volume:/var/gerrit/git
- - db-volume:/var/gerrit/db
- index-volume:/var/gerrit/index
- cache-volume:/var/gerrit/cache
ports:
@@ -79,7 +78,6 @@
volumes:
git-volume:
- db-volume:
index-volume:
cache-volume:
```
@@ -91,12 +89,11 @@
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.
+configuration directory for better change management traceability. Additionally,
+you may want to use a proper external authentication.
-Additionally, you may want to replace H2 with a more robust DBMS like PostgreSQL and an external
-authentication system such as LDAP.
-
-See below a more advanced example of docker-compose.yaml with PostgreSQL and OpenLDAP (from Osixia's DockerHub).
+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
@@ -109,26 +106,16 @@
ports:
- "29418:29418"
- "80:8080"
- links:
- - postgres
depends_on:
- - postgres
- ldap
volumes:
- - /external/gerrit/etc:/var/gerrit/etc
- - /external/gerrit/git:/var/gerrit/git
- - /external/gerrit/index:/var/gerrit/index
- - /external/gerrit/cache:/var/gerrit/cache
-# entrypoint: java -jar /var/gerrit/bin/gerrit.war init -d /var/gerrit
-
- postgres:
- image: postgres:9.6
+ - /external/gerrit/etc:/var/gerrit/etc
+ - /external/gerrit/git:/var/gerrit/git
+ - /external/gerrit/index:/var/gerrit/index
+ - /external/gerrit/cache:/var/gerrit/cache
environment:
- - POSTGRES_USER=gerrit
- - POSTGRES_PASSWORD=secret
- - POSTGRES_DB=reviewdb
- volumes:
- - /external/gerrit/postgres:/var/lib/postgresql/data
+ - CANONICAL_WEB_URL=http://localhost
+# entrypoint: java -jar /var/gerrit/bin/gerrit.war init -d /var/gerrit
ldap:
image: osixia/openldap
@@ -157,10 +144,8 @@
canonicalWebUrl = http://localhost
[database]
- type = postgresql
- hostname = postgres
- database = reviewdb
- username = gerrit
+ type = h2
+ database = db/ReviewDB
[index]
type = LUCENE
@@ -195,9 +180,6 @@
Example of /external/gerrit/etc/secure.config
```
-[database]
- password = secret
-
[ldap]
password = secret
```
@@ -211,18 +193,7 @@
The initialization can be done as a one-off operation before starting all containers.
-#### Step-1: Create the PostgreSQL ReviewDB
-
-Start the postgres image standalone using docker compose:
-
-```
-docker-compose up -d postgres
-docker-compose logs -f postgres
-```
-
-Wait until you see in the output a message like: "database system is ready to accept connections"
-
-#### Step-2: Run Gerrit docker init setup from docker
+#### 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
in foreground.
@@ -234,7 +205,7 @@
Wait until you see in the output the message ```Initialized /var/gerrit``` and then the container
will exit.
-#### Step-3: Start Gerrit in daemon mode
+#### Step-2: Start Gerrit in daemon mode
Comment out the gerrit init entrypoint in docker-compose.yaml and start all the docker-compose nodes:
@@ -280,4 +251,4 @@
Refer to Gerrit Documentation at http://localhost/Documentation/index.html for more information on
how to configure, administer and use Gerrit Code Review.
-For a full list of Gerrit Code Review resources, refer to the [Gerrit Code Review home page](https://www.gerritcodereview.com)
\ No newline at end of file
+For a full list of Gerrit Code Review resources, refer to the [Gerrit Code Review home page](https://www.gerritcodereview.com)
