Merge branch 'stable-3.8' * stable-3.8: Add trailing slash in default canonicalWebUrl Set Gerrit to 3.7.5 Set Gerrit to 3.6.7 Set Gerrit to 3.7.4 Set Gerrit to 3.6.6 Set Gerrit to 3.7.3 Set Gerrit to 3.6.5 Change-Id: I26731627508e3a70ec92734b8e1b4cb0c2cef42f
diff --git a/almalinux/9/entrypoint.sh b/almalinux/9/entrypoint.sh index 1fc4530..30f4ef5 100755 --- a/almalinux/9/entrypoint.sh +++ b/almalinux/9/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/22/entrypoint.sh b/ubuntu/22/entrypoint.sh index 1fc4530..30f4ef5 100755 --- a/ubuntu/22/entrypoint.sh +++ b/ubuntu/22/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}