From 688e959b8af2b00401f1ba63829905b98d02cc38 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Thu, 9 Jan 2025 09:01:15 -0800 Subject: [PATCH] Update to Gitea 1.23 This updates our gitea image builds to Gitea 1.23. There are a number of breaking changes (noted below) and the full changelog can be seen here: https://github.com/go-gitea/gitea/blob/v1.23.1/CHANGELOG.md * BREAKING * Rename config option [camo].Allways to [camo].Always (#32097) * This config section is not in our app.ini. * Remove SHA1 for support for ssh rsa signing (#31857) * We don't require the use of ssh rsa signing so shouldn't impact us. * Use UTC as default timezone when schedule Actions cron tasks (#31742) * We don't use Actions so this shouldn't affect us. * Delete Actions logs older than 1 year by default (#31735) * We don't use Actions so this shouldn't affect us. * Make OIDC introspection authentication strictly require Client ID and secret (#31632) * We don't use OIDC so this shouldn't affect us. Separately I believe that a fix for the memory leak we have observed did land in 1.23. We do update to golang 1.23 to match upstream, and have edited our overridden template to match as well. Finally, we switch the mariadb image over to our opendevmirror'd image on quay.io. This is a good opportunity to make the switch as it avoids unnecessary extra downtime/upgrades. Change-Id: Ie613160477d2236a27dc047131ba003cb396b84b --- docker/gitea/Dockerfile | 4 ++-- .../gitea/custom/templates/base/head_navbar.tmpl | 14 +++++++------- docker/gitea/custom/templates/repo/header.tmpl | 14 +++++++------- .../roles/gitea/templates/docker-compose.yaml.j2 | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile index 7fc6b28120..3d2c7423f5 100644 --- a/docker/gitea/Dockerfile +++ b/docker/gitea/Dockerfile @@ -25,14 +25,14 @@ ################################### # Build stage -FROM docker.io/library/golang:1.22-bookworm AS build-env +FROM docker.io/library/golang:1.23-bookworm AS build-env LABEL maintainer="infra-root@openstack.org" ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} -ARG GITEA_VERSION="v1.22.6" +ARG GITEA_VERSION="v1.23.1" ENV TAGS "bindata timetzdata $TAGS" # Build deps diff --git a/docker/gitea/custom/templates/base/head_navbar.tmpl b/docker/gitea/custom/templates/base/head_navbar.tmpl index 5162356e5f..4b77a979e1 100644 --- a/docker/gitea/custom/templates/base/head_navbar.tmpl +++ b/docker/gitea/custom/templates/base/head_navbar.tmpl @@ -11,7 +11,7 @@ -
+
{{if and .IsSigned EnableTimetracking .ActiveStopwatch}}
@@ -35,13 +35,13 @@ {{if and .IsSigned .MustChangePassword}} {{/* No links */}} {{else if .IsSigned}} - {{if not .UnitIssuesGlobalDisabled}} + {{if not ctx.Consts.RepoUnitTypeIssues.UnitGlobalDisabled}} {{ctx.Locale.Tr "issues"}} {{end}} - {{if not .UnitPullsGlobalDisabled}} + {{if not ctx.Consts.RepoUnitTypePullRequests.UnitGlobalDisabled}} {{ctx.Locale.Tr "pull_requests"}} {{end}} - {{if not (and .UnitIssuesGlobalDisabled .UnitPullsGlobalDisabled)}} + {{if not (and ctx.Consts.RepoUnitTypeIssues.UnitGlobalDisabled ctx.Consts.RepoUnitTypePullRequests.UnitGlobalDisabled)}} {{if .ShowMilestonesDashboardPage}} {{ctx.Locale.Tr "milestones"}} {{end}} @@ -70,7 +70,7 @@ {{svg "octicon-triangle-down"}}
-
+
{{ctx.Locale.Tr "signed_in_as"}} {{.SignedUser.Name}}
@@ -128,7 +128,7 @@ {{svg "octicon-triangle-down"}}
-
+
{{ctx.Locale.Tr "signed_in_as"}} {{.SignedUser.Name}}
@@ -158,7 +158,7 @@ {{if .IsAdmin}}
- + {{svg "octicon-server"}} {{ctx.Locale.Tr "admin_panel"}} diff --git a/docker/gitea/custom/templates/repo/header.tmpl b/docker/gitea/custom/templates/repo/header.tmpl index 453ae4ab3a..e03d2e3ad6 100644 --- a/docker/gitea/custom/templates/repo/header.tmpl +++ b/docker/gitea/custom/templates/repo/header.tmpl @@ -123,7 +123,7 @@
{{ctx.Locale.Tr "repo.mirror_from"}} {{$.PullMirror.RemoteAddress}} - {{if $.PullMirror.UpdatedUnix}}{{ctx.Locale.Tr "repo.mirror_sync"}} {{TimeSinceUnix $.PullMirror.UpdatedUnix ctx.Locale}}{{end}} + {{if $.PullMirror.UpdatedUnix}}{{ctx.Locale.Tr "repo.mirror_sync"}} {{DateUtils.TimeSince $.PullMirror.UpdatedUnix}}{{end}}
{{end}} {{if .IsFork}}
{{ctx.Locale.Tr "repo.forked_from"}} {{.BaseRepo.FullName}}
{{end}} @@ -164,7 +164,7 @@ {{end}} - {{if and .EnableActions (not .UnitActionsGlobalDisabled) (.Permission.CanRead ctx.Consts.RepoUnitTypeActions)}} + {{if and .EnableActions (.Permission.CanRead ctx.Consts.RepoUnitTypeActions) (not .IsEmptyRepo)}} {{svg "octicon-play"}} {{ctx.Locale.Tr "actions.actions"}} {{if .Repository.NumOpenActionRuns}} @@ -174,7 +174,7 @@ {{end}} - + {{svg "octicon-git-pull-request"}} Proposed changes @@ -184,10 +184,10 @@ {{end}} - {{$projectsUnit := .Repository.MustGetUnit $.Context ctx.Consts.RepoUnitTypeProjects}} - {{if and (not .UnitProjectsGlobalDisabled) (.Permission.CanRead ctx.Consts.RepoUnitTypeProjects) ($projectsUnit.ProjectsConfig.IsProjectsAllowed "repo")}} + {{$projectsUnit := .Repository.MustGetUnit ctx ctx.Consts.RepoUnitTypeProjects}} + {{if and (not ctx.Consts.RepoUnitTypeProjects.UnitGlobalDisabled) (.Permission.CanRead ctx.Consts.RepoUnitTypeProjects) ($projectsUnit.ProjectsConfig.IsProjectsAllowed "repo")}} - {{svg "octicon-project"}} {{ctx.Locale.Tr "repo.project_board"}} + {{svg "octicon-project"}} {{ctx.Locale.Tr "repo.projects"}} {{if .Repository.NumOpenProjects}} {{CountFmt .Repository.NumOpenProjects}} {{end}} @@ -212,7 +212,7 @@ {{end}} {{if .Permission.CanRead ctx.Consts.RepoUnitTypeExternalWiki}} - + {{svg "octicon-link-external"}} {{ctx.Locale.Tr "repo.wiki"}} {{end}} diff --git a/playbooks/roles/gitea/templates/docker-compose.yaml.j2 b/playbooks/roles/gitea/templates/docker-compose.yaml.j2 index f64881141e..5f0ca67c24 100644 --- a/playbooks/roles/gitea/templates/docker-compose.yaml.j2 +++ b/playbooks/roles/gitea/templates/docker-compose.yaml.j2 @@ -4,7 +4,7 @@ version: '2' services: mariadb: - image: docker.io/library/mariadb:10.11 + image: quay.io/opendevmirror/mariadb:10.11 network_mode: host restart: always environment: