Commit 23dea9c8 authored by Stephan Großberndt's avatar Stephan Großberndt
Browse files

[FEATURE] Upgrade Gerrit to 3.0.0 based on Ubuntu 18 and use PHP 7.2

parent 0fb100b4
FROM gerritcodereview/gerrit:2.16.8-ubuntu16
FROM gerritcodereview/gerrit:3.0.0-ubuntu18
# Add PHP for hooks
USER root
RUN apt-get update && apt-get install --yes --no-install-recommends \
php7.0-cli php7.0-curl \
RUN export DEBIAN_FRONTEND=noninteractive \
&& apt-get update \
&& apt-get install --yes --no-install-recommends php7.2-cli php7.2-curl \
&& apt-get clean \
&& ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime \
&& dpkg-reconfigure --frontend noninteractive tzdata \
&& rm -rf /var/lib/apt/lists/*
USER gerrit
......@@ -14,11 +17,11 @@ USER gerrit
# Add assets
ADD assets/hooks /var/gerrit/hooks
ADD assets/lib /var/gerrit/lib
RUN rm -f /var/gerrit/plugins/avatars-gravatar.jar \
/var/gerrit/plugins/gitiles.jar \
/var/gerrit/plugins/plugin-manager.jar \
/var/gerrit/plugins/webhooks.jar
RUN rm -rf /var/gerrit/plugins
ADD assets/plugins /var/gerrit/plugins
ADD assets/hooks /var/gerrit/hooks
ADD assets/static /var/gerrit/static
......@@ -24,9 +24,9 @@ services:
#environment:
# - CANONICAL_WEB_URL=https://review.typo3.local
# Uncomment this entrypoint to initialize Gerrit
#entrypoint: java -jar /var/gerrit/bin/gerrit.war init -d /var/gerrit
# entrypoint: /entrypoint.sh init -d /var/gerrit
# Uncomment this entrypoint to reindex Gerrit
#entrypoint: java -jar /var/gerrit/bin/gerrit.war reindex -d /var/gerrit --threads 4
#entrypoint: /entrypoint.sh init reindex -d /var/gerrit --threads 4
# Development container for access to https://review.typo3.local
# reverse-proxy:
......
......@@ -9,17 +9,10 @@
[container]
javaOptions = "-Dflogger.backend_factory=com.google.common.flogger.backend.log4j.Log4jBackendFactory#getInstance"
javaOptions = "-Dflogger.logging_context=com.google.gerrit.server.logging.LoggingContext#getInstance"
javaOptions = -Djava.security.egd=file:/dev/./urandom
user = gerrit
javaHome = /usr/lib/jvm/java-8-openjdk-amd64/jre
[database]
type = mysql
database = gerrit
hostname = srv198.typo3.org
username = gerrit
poolMaxIdle = 8
poolLimit = 36
[auth]
type = LDAP
gitBasicAuthPolicy = HTTP_LDAP
......
......@@ -19,12 +19,12 @@
/**
* .Abandoned template will determine the contents of the email related to a
* change being abandoned.
* @param change
* @param coverLetter
* @param email
* @param fromName
*/
{template .Abandoned kind="text"}
{@param change: ?}
{@param coverLetter: ?}
{@param email: ?}
{@param fromName: ?}
{$fromName} has abandoned this change.
{if $email.changeUrl} ( {$email.changeUrl} ){/if}{\n}
{\n}
......
......@@ -16,12 +16,10 @@
{namespace com.google.gerrit.server.mail.template}
/**
* @param coverLetter
* @param email
* @param fromName
*/
{template .AbandonedHtml}
{@param coverLetter: ?}
{@param email: ?}
{@param fromName: ?}
<p>
{$fromName} <strong>abandoned</strong> this change.
</p>
......
......@@ -19,9 +19,9 @@
/**
* The .AddKey template will determine the contents of the email related to
* adding a new SSH or GPG key to an account.
* @param email
*/
{template .AddKey kind="text"}
{@param email: ?}
One or more new {$email.keyType} keys have been added to Gerrit Code Review at
{sp}{$email.gerritHost}:
......
......@@ -16,10 +16,8 @@
{namespace com.google.gerrit.server.mail.template}
/**
* @param email
*/
{template .AddKeyHtml}
{@param email: ?}
<p>
One or more new {$email.keyType} keys have been added to Gerrit Code Review
at {$email.gerritHost}:
......
......@@ -19,9 +19,9 @@
/**
* The .ChangeFooter template will determine the contents of the footer text
* that will be appended to ALL emails related to changes.
* @param email
*/
{template .ChangeFooter kind="text"}
{@param email: ?}
--{sp}
{\n}
......
......@@ -16,11 +16,9 @@
{namespace com.google.gerrit.server.mail.template}
/**
* @param change
* @param email
*/
{template .ChangeFooterHtml}
{@param change: ?}
{@param email: ?}
{if $email.changeUrl or $email.settingsUrl}
<p>
{if $email.changeUrl}
......@@ -38,7 +36,7 @@
{if $email.changeUrl}
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemscope itemprop="action" itemtype="http://schema.org/ViewAction">
<link itemprop="url" href="{$email.changeUrl |blessStringAsTrustedResourceUrlForLegacy}"/>
<link itemprop="url" href="{$email.changeUrl}"/>
<meta itemprop="name" content="View Change"/>
</div>
</div>
......
......@@ -19,13 +19,13 @@
/**
* The .ChangeSubject template will determine the contents of the email subject
* line for ALL emails related to changes.
* @param branch
* @param change
* @param shortProjectName
* @param instanceAndProjectName
* @param addInstanceNameInSubject boolean
*/
{template .ChangeSubject kind="text"}
{@param branch: ?}
{@param change: ?}
{@param shortProjectName: ?}
{@param instanceAndProjectName: ?}
{@param addInstanceNameInSubject: ?} /** boolean */
{if not $addInstanceNameInSubject}
Change in {$shortProjectName}[{$branch.shortName}]: {$change.shortSubject}
{else}
......
......@@ -19,13 +19,13 @@
/**
* The .Comment template will determine the contents of the email related to a
* user submitting comments on changes.
* @param change
* @param coverLetter
* @param email
* @param fromName
* @param commentFiles
*/
{template .Comment kind="text"}
{@param change: ?}
{@param coverLetter: ?}
{@param email: ?}
{@param fromName: ?}
{@param commentFiles: ?}
{$fromName} has posted comments on this change.
{if $email.changeUrl} ( {$email.changeUrl} ){/if}{\n}
{\n}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment