commit f7ebac133bae53f3076808e29b582c01c20747d7
author David Pursehouse <dpursehouse@collab.net> Tue Oct 09 19:24:58 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Tue Oct 09 19:24:58 2018 +0900
tree aa52f7b2e972b031189e987e2d5a216fdeabcfba
parent 84bc7540c2a67067e42ddac76764e4e3a0dbde63
parent 0d582bd3c995296ef22eeb6706f117fe8bcabc83

Merge branch 'stable-2.15'

* stable-2.15:
  Set Gerrit to 2.15.5
  Set Gerrit to 2.14.15
  Do not require openssh-clients
  Upgrade to Gerrit version 2.15.4
  Set Gerrit to 2.14.14
  Set Gerrit to 2.14.13
  Set Gerrit to 2.14.12
  Set Gerrit to 2.14.11
  Upgrade to Gerrit version 2.15.3
  Set Gerrit to 2.14.10
  Set Gerrit to v2.14.9
  Upgrade to Gerrit version 2.15.2
  Use /dev/urandom to speedup Server startup
  Run reindex on Ubuntu 16
  Set Gerrit to v2.14.8
  Set Gerrit to  v2.14.7
  Set Gerrit to  v2.14.6
  Set Gerrit to  v2.14.5.1
  Set Gerrit to  v2.14.4

Change-Id: I52a12d0e43daf2feb09725e855445e5296476a5b

PULL_REQUEST_TEMPLATE.md

diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..19c0f3a
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,7 @@
+# Important Notice
+
+Patch submission and review is done through [Gerrit Code Review](https://gerrit-review.googlesource.com).
+Unfortunately we cannot pull your code as a Pull Request.
+
+__NO REVIEWS OR DISCUSSIONS will happen on GitHub__, all the code collaboration
+will take place on Gerrit.

centos/7/Dockerfile

diff --git a/centos/7/Dockerfile b/centos/7/Dockerfile
index b02a62b..e4ef1c5 100644
--- a/centos/7/Dockerfile
+++ b/centos/7/Dockerfile
@@ -24,6 +24,6 @@
 VOLUME ["/var/gerrit/git", "/var/gerrit/index", "/var/gerrit/cache", "/var/gerrit/db", "/var/gerrit/etc"]
 
 # Start Gerrit
-CMD git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME:8080/}" && \
+CMD git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME}" && \
     git config -f /var/gerrit/etc/gerrit.config noteDb.changes.autoMigrate true && \
         /var/gerrit/bin/gerrit.sh run

ubuntu/16/Dockerfile

diff --git a/ubuntu/16/Dockerfile b/ubuntu/16/Dockerfile
index 7aac861..a90df96 100644
--- a/ubuntu/16/Dockerfile
+++ b/ubuntu/16/Dockerfile
@@ -27,6 +27,6 @@
 VOLUME ["/var/gerrit/git", "/var/gerrit/index", "/var/gerrit/cache", "/var/gerrit/db", "/var/gerrit/etc"]
 
 # Start Gerrit
-CMD git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME:8080/}" && \
+CMD git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME}" && \
     git config -f /var/gerrit/etc/gerrit.config noteDb.changes.autoMigrate true && \
         /var/gerrit/bin/gerrit.sh run