From 4f405f13f5e1aa8503ac757ce19703b4b976ba80 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 20 May 2020 09:40:25 -0700 Subject: [PATCH] Update to gitea 1.12.0 Gitea 1.12.0 brings much improved git repo performance. Specifically it caches the most recent commits helping the web views render much more quickly. This bumps our golang base image to 1.14-buster as gitea has changed their default golang verison to 1.14. We also add gnupg to the package install list as the upstream images did this. In the templates I've tried to comment out rather than remove content that we don't want exposed. The reason for this is it makes resolving future template updates simpler. For v1.12.0 release notes see: https://github.com/go-gitea/gitea/blob/v1.12.0/CHANGELOG.md Change-Id: I8fd6587c8962554023d878266055a2bd9d2499f9 --- docker/gitea/Dockerfile | 5 +- .../custom/templates/base/head_navbar.tmpl | 88 ++++++--- .../gitea/custom/templates/repo/header.tmpl | 177 +++++++++++++----- 3 files changed, 196 insertions(+), 74 deletions(-) diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile index 6b0213b85d..1ef7003c8a 100644 --- a/docker/gitea/Dockerfile +++ b/docker/gitea/Dockerfile @@ -22,11 +22,11 @@ ################################### #Build stage -FROM docker.io/library/golang:1.13-buster AS build-env +FROM docker.io/library/golang:1.14-buster AS build-env LABEL maintainer="infra-root@openstack.org" -ARG GITEA_VERSION="v1.11.4" +ARG GITEA_VERSION="v1.12.0" ENV TAGS "bindata $TAGS" #Build deps @@ -58,6 +58,7 @@ RUN apt-get update && apt-get -y install \ git \ openssh-client \ tzdata \ + gnupg \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/docker/gitea/custom/templates/base/head_navbar.tmpl b/docker/gitea/custom/templates/base/head_navbar.tmpl index 0503ae8cd5..c518df60ae 100644 --- a/docker/gitea/custom/templates/base/head_navbar.tmpl +++ b/docker/gitea/custom/templates/base/head_navbar.tmpl @@ -8,11 +8,19 @@ - {{if .IsSigned}} + {{if and .IsSigned .MustChangePassword}} + {{/* No links */}} + {{else if .IsSigned}} {{.i18n.Tr "dashboard"}} + {{if not .UnitIssuesGlobalDisabled}} {{.i18n.Tr "issues"}} + {{end}} + {{if not .UnitPullsGlobalDisabled}} {{.i18n.Tr "pull_requests"}} + {{end}} + {{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}} {{if .ShowMilestonesDashboardPage}}{{.i18n.Tr "milestones"}}{{end}} + {{end}} {{.i18n.Tr "explore"}} {{else if .IsLandingPageHome}} {{.i18n.Tr "home"}} @@ -34,37 +42,59 @@ */}} - {{if .IsSigned}} + + {{if and .IsSigned .MustChangePassword}} +
+
+ + + {{.i18n.Tr "user_profile_and_more"}} + {{.SignedUser.Name}} + {{svg "octicon-triangle-down" 16}} + +
+
+ {{.i18n.Tr "signed_in_as"}} {{.SignedUser.Name}} +
+ +
+ + {{svg "octicon-sign-out" 16}} + {{.i18n.Tr "sign_out"}} + +
+
+
+ {{else if .IsSigned}}
- + {{svg "octicon-bell" 16}} {{.i18n.Tr "notifications"}} - - {{if .NotificationUnreadCount}} - - {{.NotificationUnreadCount}} - - {{end}} + {{$notificationUnreadCount := 0}} + {{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}} + + {{$notificationUnreadCount}} +
- + {{svg "octicon-plus" 16}} {{.i18n.Tr "create_new"}} - + {{svg "octicon-triangle-down" 16}}
- {{.i18n.Tr "new_repo"}} + {{svg "octicon-plus" 16}} {{.i18n.Tr "new_repo"}} - {{.i18n.Tr "new_migrate"}} + {{svg "octicon-repo-clone" 16}} {{.i18n.Tr "new_migrate"}} {{if .SignedUser.CanCreateOrganization}} - {{.i18n.Tr "new_org"}} + {{svg "octicon-organization" 16}} {{.i18n.Tr "new_org"}} {{end}}
@@ -72,10 +102,10 @@
- + {{.i18n.Tr "user_profile_and_more"}} {{.SignedUser.Name}} - + {{svg "octicon-triangle-down" 16}}
@@ -84,22 +114,21 @@
- + {{svg "octicon-person" 16}} {{.i18n.Tr "your_profile"}} - + {{svg "octicon-star" 16}} {{.i18n.Tr "your_starred"}} - + {{svg "octicon-settings" 16}} {{.i18n.Tr "your_settings"}} - + {{svg "octicon-repo-push" 16}} Get Started - {{if .IsAdmin}}
@@ -110,19 +139,26 @@ {{end}}
- - + + {{svg "octicon-sign-out" 16}} {{.i18n.Tr "sign_out"}}
- {{else}} - Get Started
+
- {{end}}
diff --git a/docker/gitea/custom/templates/repo/header.tmpl b/docker/gitea/custom/templates/repo/header.tmpl index 00a2aad6bf..381bfadfc6 100644 --- a/docker/gitea/custom/templates/repo/header.tmpl +++ b/docker/gitea/custom/templates/repo/header.tmpl @@ -4,70 +4,155 @@
{{if .RelAvatarLink}} - + + {{else if .IsTemplate}} + {{if .IsPrivate}} + {{svg "octicon-repo-template-private" 32}} + {{else}} + {{svg "octicon-repo-template" 32}} + {{end}} {{else}} - + {{if .IsPrivate}} + {{svg "octicon-lock" 32}} + {{else if .IsMirror}} + {{svg "octicon-repo-clone" 32}} + {{else if .IsFork}} + {{svg "octicon-repo-forked" 32}} + {{else}} + {{svg "octicon-repo" 32}} + {{end}} {{end}} {{.Owner.Name}}
/
{{.Name}} - {{if .IsTemplate}}{{end}} + {{if .RelAvatarLink}} + {{if .IsTemplate}} + {{if .IsPrivate}} + {{svg "octicon-repo-template-private" 32}} + {{else}} + {{svg "octicon-repo-template" 32}} + {{end}} + {{else}} + {{if .IsPrivate}} + {{svg "octicon-lock" 32}} + {{else if .IsMirror}} + {{svg "octicon-repo-clone" 32}} + {{else if .IsFork}} + {{svg "octicon-repo-forked" 32}} + {{else}} + {{svg "octicon-repo" 32}} + {{end}} + {{end}} + {{end}} {{if .IsArchived}}{{end}} {{if .IsMirror}}
{{$.i18n.Tr "repo.mirror_from"}} {{if .SanitizedOriginalURL}}{{.SanitizedOriginalURL}}{{else}}{{MirrorAddress $.Mirror}}{{end}}
{{end}} {{if .IsFork}}
{{$.i18n.Tr "repo.forked_from"}} {{SubStr .BaseRepo.RelLink 1 -1}}
{{end}} {{if .IsGenerated}}
{{$.i18n.Tr "repo.generated_from"}} {{SubStr .TemplateRepo.RelLink 1 -1}}
{{end}}
+
{{end}} -
- {{if not .Repository.IsBeingCreated}} -
- {{if .Permission.CanRead $.UnitTypeCode}} - - {{.i18n.Tr "repo.code"}} - - {{end}} +
+ {{if not .Repository.IsBeingCreated}} +
+ {{if .Permission.CanRead $.UnitTypeCode}} + + {{svg "octicon-code" 16}} {{.i18n.Tr "repo.code"}} + + {{end}} - {{if .Permission.CanRead $.UnitTypeIssues}} - - {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} - - {{end}} + {{if .Permission.CanRead $.UnitTypeIssues}} + + {{svg "octicon-issue-opened" 16}} {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} + + {{end}} - {{if .Permission.CanRead $.UnitTypeExternalTracker}} - - {{.i18n.Tr "repo.issues"}} - - {{end}} + {{if .Permission.CanRead $.UnitTypeExternalTracker}} + + {{svg "octicon-link-external" 16}} {{.i18n.Tr "repo.issues"}} + + {{end}} - {{if and .Repository.CanEnablePulls (.Permission.CanRead $.UnitTypePullRequests)}} - - {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} - - {{end}} + {{if and .Repository.CanEnablePulls (.Permission.CanRead $.UnitTypePullRequests)}} + + {{svg "octicon-git-pull-request" 16}} {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} + + {{end}} - - Proposed changes - + + + {{svg "octicon-git-pull-request" 16}} Proposed changes + - {{if or (.Permission.CanRead $.UnitTypeWiki) (.Permission.CanRead $.UnitTypeExternalWiki)}} - - {{.i18n.Tr "repo.wiki"}} - - {{end}} + - {{template "custom/extra_tabs" .}} + {{if or (.Permission.CanRead $.UnitTypeWiki) (.Permission.CanRead $.UnitTypeExternalWiki)}} + + {{svg "octicon-book" 16}} {{.i18n.Tr "repo.wiki"}} + + {{end}} - {{if .Permission.IsAdmin}} -
- - {{.i18n.Tr "repo.settings"}} - -
- {{end}} -
- {{end}} -
-
+ {{if and (.Permission.CanReadAny $.UnitTypePullRequests $.UnitTypeIssues $.UnitTypeReleases) (not .IsEmptyRepo)}} + + {{svg "octicon-pulse" 16}} {{.i18n.Tr "repo.activity"}} + + {{end}} + + {{template "custom/extra_tabs" .}} + + {{if .Permission.IsAdmin}} +
+ + {{svg "octicon-tools" 16}} {{.i18n.Tr "repo.settings"}} + +
+ {{end}} +
+ {{end}} +
+