Align Ubuntu with CentOS startup
Change-Id: Ie771eb61c40f6289ca071165b74dcbfc0451441a
diff --git a/ubuntu/16/Dockerfile b/ubuntu/16/Dockerfile
index c107cdd..f578d57 100644
--- a/ubuntu/16/Dockerfile
+++ b/ubuntu/16/Dockerfile
@@ -17,6 +17,9 @@
USER gerrit
RUN java -jar /var/gerrit/bin/gerrit.war init --batch --install-all-plugins -d /var/gerrit
+RUN java -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit
+
+ENV CANONICAL_WEB_URL=
# Allow incoming traffic
EXPOSE 29418 8080
@@ -24,4 +27,6 @@
VOLUME ["/var/gerrit/git", "/var/gerrit/index", "/var/gerrit/cache", "/var/gerrit/db", "/var/gerrit/etc"]
# Start Gerrit
-CMD /var/gerrit/bin/gerrit.sh start && tail -f /var/gerrit/logs/error_log
+CMD git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME:8080/}" && \
+ git config -f /var/gerrit/etc/gerrit.config noteDb.changes.autoMigrate true && \
+ /var/gerrit/bin/gerrit.sh run
