From 0d95d6114ac0ce082f6f645b7f2f0309cd867b35 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 4 Jan 2021 14:28:05 -0800 Subject: [PATCH] Update gitea to 1.13.1 This bumps our golang image up to buster-1.15 from buster-1.14 as gitea bumps their minimum to 1.13 and I figure we should keep up to date. The templates are updated to accomodate the new gitea templates. Primary changes here are removal of icon sizes when specified and using imported templates to simplify bits of code we weren't changing anyway. We install openssh-server from buster-backports on our gitea-ssh image. The reason for this is we pull in gitea's sshd_config from gitea itself and the updated gitea wants to set options that older openssh in buster proper doesn't support. Accomodate this with the newer openssh found in backports. We add a new favicon.svg to override the new default gitea svg favicon which is served otherwise. One other thing to call out is that gitea 1.13.0 added support for kanban and similar project management tooling. We have explicitly disabled this along with the wiki, issues and pull requests via app.ini's repository.DISABLE_REPO_UNITS setting. You can find out more about this setting here: https://docs.gitea.io/en-us/config-cheat-sheet/#repository-repository Change-Id: I4c483f90c7495ee1f80eacd2c79c38836aa6f483 --- docker/gitea/Dockerfile | 9 +- docker/gitea/custom/public/img/favicon.svg | 1 + .../custom/templates/base/head_navbar.tmpl | 34 +++---- .../gitea/custom/templates/repo/header.tmpl | 94 +++++++++---------- playbooks/roles/gitea/templates/app.ini.j2 | 1 + 5 files changed, 69 insertions(+), 70 deletions(-) create mode 100644 docker/gitea/custom/public/img/favicon.svg diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile index ecddeb9c2b..37e7b5670e 100644 --- a/docker/gitea/Dockerfile +++ b/docker/gitea/Dockerfile @@ -22,11 +22,11 @@ ################################### #Build stage -FROM docker.io/library/golang:1.14-buster AS build-env +FROM docker.io/library/golang:1.15-buster AS build-env LABEL maintainer="infra-root@openstack.org" -ARG GITEA_VERSION="v1.12.5" +ARG GITEA_VERSION="v1.13.1" ENV TAGS "bindata $TAGS" #Build deps @@ -104,9 +104,12 @@ USER 1000:1000 # The openssh server image FROM base as gitea-openssh +# We enable backports here to install newer openssh which includes +# support for options that gitea's ssh configuration expects +RUN echo 'deb http://deb.debian.org/debian buster-backports main' > /etc/apt/sources.list.d/backports.list RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confold" \ - install openssh-server \ + -t buster-backports install openssh-server \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* \ && mkdir /run/sshd diff --git a/docker/gitea/custom/public/img/favicon.svg b/docker/gitea/custom/public/img/favicon.svg new file mode 100644 index 0000000000..6597b83bf2 --- /dev/null +++ b/docker/gitea/custom/public/img/favicon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/docker/gitea/custom/templates/base/head_navbar.tmpl b/docker/gitea/custom/templates/base/head_navbar.tmpl index c518df60ae..485da790f1 100644 --- a/docker/gitea/custom/templates/base/head_navbar.tmpl +++ b/docker/gitea/custom/templates/base/head_navbar.tmpl @@ -50,7 +50,7 @@ {{.i18n.Tr "user_profile_and_more"}} {{.SignedUser.Name}} - {{svg "octicon-triangle-down" 16}} + {{svg "octicon-triangle-down"}}
@@ -59,7 +59,7 @@
- {{svg "octicon-sign-out" 16}} + {{svg "octicon-sign-out"}} {{.i18n.Tr "sign_out"}}
@@ -69,7 +69,7 @@
- {{svg "octicon-bell" 16}} + {{svg "octicon-bell"}} {{.i18n.Tr "notifications"}} {{$notificationUnreadCount := 0}} {{if .NotificationUnreadCount}}{{$notificationUnreadCount = call .NotificationUnreadCount}}{{end}} @@ -81,20 +81,20 @@
- {{svg "octicon-plus" 16}} + {{svg "octicon-plus"}} {{.i18n.Tr "create_new"}} - {{svg "octicon-triangle-down" 16}} + {{svg "octicon-triangle-down"}}
- {{svg "octicon-plus" 16}} {{.i18n.Tr "new_repo"}} + {{svg "octicon-plus"}} {{.i18n.Tr "new_repo"}} - {{svg "octicon-repo-clone" 16}} {{.i18n.Tr "new_migrate"}} + {{svg "octicon-repo-push"}} {{.i18n.Tr "new_migrate"}} {{if .SignedUser.CanCreateOrganization}} - {{svg "octicon-organization" 16}} {{.i18n.Tr "new_org"}} + {{svg "octicon-organization"}} {{.i18n.Tr "new_org"}} {{end}}
@@ -105,7 +105,7 @@ {{.i18n.Tr "user_profile_and_more"}} {{.SignedUser.Name}} - {{svg "octicon-triangle-down" 16}} + {{svg "octicon-triangle-down"}}
@@ -114,19 +114,19 @@
- {{svg "octicon-person" 16}} + {{svg "octicon-person"}} {{.i18n.Tr "your_profile"}} - {{svg "octicon-star" 16}} + {{svg "octicon-star"}} {{.i18n.Tr "your_starred"}} - {{svg "octicon-settings" 16}} + {{svg "octicon-tools"}} {{.i18n.Tr "your_settings"}} - {{svg "octicon-repo-push" 16}} + {{svg "octicon-repo-push"}} Get Started {{if .IsAdmin}} @@ -140,7 +140,7 @@
- {{svg "octicon-sign-out" 16}} + {{svg "octicon-sign-out"}} {{.i18n.Tr "sign_out"}}
@@ -152,11 +152,11 @@
diff --git a/docker/gitea/custom/templates/repo/header.tmpl b/docker/gitea/custom/templates/repo/header.tmpl index 4a5e5e9c17..cc42b92829 100644 --- a/docker/gitea/custom/templates/repo/header.tmpl +++ b/docker/gitea/custom/templates/repo/header.tmpl @@ -5,46 +5,30 @@
{{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}} + {{template "repo/header_icon" .}} {{end}} {{.Owner.Name}}
/
{{.Name}} - {{if .RelAvatarLink}} - {{if .IsTemplate}} - {{if .IsPrivate}} - {{svg "octicon-repo-template-private" 32}} - {{else}} - {{svg "octicon-repo-template" 32}} - {{end}} + {{if .IsTemplate}} + {{if .IsPrivate}} + {{$.i18n.Tr "repo.desc.private_template"}} {{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}} + {{if .Owner.Visibility.IsPrivate}} + {{$.i18n.Tr "repo.desc.internal_template"}} + {{end}} + {{end}} + {{else}} + {{if .IsPrivate}} + {{$.i18n.Tr "repo.desc.private"}} + {{else}} + {{if .Owner.Visibility.IsPrivate}} + {{$.i18n.Tr "repo.desc.internal"}} {{end}} {{end}} {{end}} - {{if .IsArchived}}{{end}} + {{if .IsArchived}}{{$.i18n.Tr "repo.desc.archived"}}{{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}} @@ -54,33 +38,33 @@
{{$.CsrfTokenHtml}} -
- - {{.NumWatches}} + {{CountFmt .NumWatches}}
{{$.CsrfTokenHtml}} -
- - {{.NumStars}} + {{CountFmt .NumStars}}
{{if and (not .IsEmpty) ($.Permission.CanRead $.UnitTypeCode)}}
- {{svg "octicon-repo-forked" 15}}{{$.i18n.Tr "repo.fork"}} + {{svg "octicon-repo-forked"}}{{$.i18n.Tr "repo.fork"}} - {{.NumForks}} + {{CountFmt .NumForks}}
{{end}} @@ -95,51 +79,61 @@
{{if .Permission.CanRead $.UnitTypeCode}} - {{svg "octicon-code" 16}} {{.i18n.Tr "repo.code"}} + {{svg "octicon-code"}} {{.i18n.Tr "repo.code"}} {{end}} {{if .Permission.CanRead $.UnitTypeIssues}} - {{svg "octicon-issue-opened" 16}} {{.i18n.Tr "repo.issues"}} {{.Repository.NumOpenIssues}} + {{svg "octicon-issue-opened"}} {{.i18n.Tr "repo.issues"}} {{CountFmt .Repository.NumOpenIssues}} {{end}} {{if .Permission.CanRead $.UnitTypeExternalTracker}} - {{svg "octicon-link-external" 16}} {{.i18n.Tr "repo.issues"}} + {{svg "octicon-link-external"}} {{.i18n.Tr "repo.issues"}} {{end}} {{if and .Repository.CanEnablePulls (.Permission.CanRead $.UnitTypePullRequests)}} - {{svg "octicon-git-pull-request" 16}} {{.i18n.Tr "repo.pulls"}} {{.Repository.NumOpenPulls}} + {{svg "octicon-git-pull-request"}} {{.i18n.Tr "repo.pulls"}} {{CountFmt .Repository.NumOpenPulls}} {{end}} - {{svg "octicon-git-pull-request" 16}} Proposed changes + {{svg "octicon-git-pull-request"}} Proposed changes + {{ if and (not .UnitProjectsGlobalDisabled) (.Permission.CanRead $.UnitTypeProjects)}} + + {{svg "octicon-project"}} {{.i18n.Tr "repo.project_board"}} + + {{CountFmt .Repository.NumOpenProjects}} + + + {{ end }} + + {{if or (.Permission.CanRead $.UnitTypeWiki) (.Permission.CanRead $.UnitTypeExternalWiki)}} - {{svg "octicon-book" 16}} {{.i18n.Tr "repo.wiki"}} + {{svg "octicon-book"}} {{.i18n.Tr "repo.wiki"}} {{end}} @@ -149,7 +143,7 @@ {{if .Permission.IsAdmin}}
- {{svg "octicon-tools" 16}} {{.i18n.Tr "repo.settings"}} + {{svg "octicon-tools"}} {{.i18n.Tr "repo.settings"}}
{{end}} diff --git a/playbooks/roles/gitea/templates/app.ini.j2 b/playbooks/roles/gitea/templates/app.ini.j2 index c3e0cc6d6c..21cb861a7a 100644 --- a/playbooks/roles/gitea/templates/app.ini.j2 +++ b/playbooks/roles/gitea/templates/app.ini.j2 @@ -31,6 +31,7 @@ LOG_SQL = false [repository] ROOT = /data/git/repositories +DISABLED_REPO_UNITS = repo.issues,repo.pulls,repo.wiki,repo.projects [indexer] ISSUE_INDEXER_PATH = /data/gitea/indexers/issues.bleve