Add trailing slash in default canonicalWebUrl Currently the default canonicalWebUrl value set by the entrypoint is missing a trailing slash. This can cause problems, for example, with plugins expecting a trailing slash in the canonicalWebUrl. Bug: Issue 311414905 Change-Id: I3c2f0309aa186147d48cfd3a4f3b3a4c0b4533f9
diff --git a/almalinux/8/entrypoint.sh b/almalinux/8/entrypoint.sh index 1fc4530..30f4ef5 100755 --- a/almalinux/8/entrypoint.sh +++ b/almalinux/8/entrypoint.sh
@@ -12,7 +12,7 @@ git config -f /var/gerrit/etc/gerrit.config --add container.javaOptions "--add-opens java.base/java.lang.invoke=ALL-UNNAMED" fi -git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME}" +git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME/}" if [ ${HTTPD_LISTEN_URL} ]; then git config -f /var/gerrit/etc/gerrit.config httpd.listenUrl ${HTTPD_LISTEN_URL}
diff --git a/ubuntu/20/entrypoint.sh b/ubuntu/20/entrypoint.sh index 1fc4530..30f4ef5 100755 --- a/ubuntu/20/entrypoint.sh +++ b/ubuntu/20/entrypoint.sh
@@ -12,7 +12,7 @@ git config -f /var/gerrit/etc/gerrit.config --add container.javaOptions "--add-opens java.base/java.lang.invoke=ALL-UNNAMED" fi -git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME}" +git config -f /var/gerrit/etc/gerrit.config gerrit.canonicalWebUrl "${CANONICAL_WEB_URL:-http://$HOSTNAME/}" if [ ${HTTPD_LISTEN_URL} ]; then git config -f /var/gerrit/etc/gerrit.config httpd.listenUrl ${HTTPD_LISTEN_URL}