diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile index 001db52955..988b0449a1 100644 --- a/docker/gitea/Dockerfile +++ b/docker/gitea/Dockerfile @@ -25,24 +25,25 @@ ################################### # Build stage -FROM docker.io/library/golang:1.24-bookworm AS build-env +FROM docker.io/library/golang:1.25-bookworm AS build-env LABEL maintainer="infra-root@openstack.org" ARG GOPROXY ENV GOPROXY ${GOPROXY:-direct} -ARG GITEA_VERSION="v1.24.7" +ARG GITEA_VERSION="v1.25.1" ENV TAGS "bindata timetzdata $TAGS" # Build deps RUN apt-get update \ && apt-get -y dist-upgrade \ && apt-get -y install build-essential git apt-transport-https curl gnupg2 \ - && curl -sS https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \ - && echo "deb https://deb.nodesource.com/node_20.x bookworm main" | tee /etc/apt/sources.list.d/nodesource.list \ + && curl -sS https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | apt-key add - \ + && echo "deb https://deb.nodesource.com/node_22.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list \ && apt-get update \ && apt-get -q --option "Dpkg::Options::=--force-confold" --assume-yes install nodejs \ + && npm install -g pnpm@10 \ && mkdir -p ${GOPATH}/src/code.gitea.io/gitea # Setup repo @@ -73,7 +74,6 @@ RUN chmod 755 docker/root/usr/bin/entrypoint \ docker/root/etc/s6/.s6-svscan/* \ /go/src/code.gitea.io/gitea/gitea \ /go/src/code.gitea.io/gitea/environment-to-ini -RUN chmod 644 /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete ################################### # Basic system setup common to all containers in our pod @@ -110,7 +110,6 @@ COPY --from=build-env /go/src/code.gitea.io/gitea/docker/root / # Copy the app COPY --from=build-env /go/src/code.gitea.io/gitea/gitea /app/gitea/gitea COPY --from=build-env /go/src/code.gitea.io/gitea/environment-to-ini /usr/local/bin/environment-to-ini -COPY --from=build-env /go/src/code.gitea.io/gitea/contrib/autocompletion/bash_autocomplete /etc/profile.d/gitea_bash_autocomplete.sh # Copy our custom templates and some additional image files COPY custom/ /custom/ diff --git a/docker/gitea/custom/templates/base/head_navbar.tmpl b/docker/gitea/custom/templates/base/head_navbar.tmpl index 914efb33de..58b11768ee 100644 --- a/docker/gitea/custom/templates/base/head_navbar.tmpl +++ b/docker/gitea/custom/templates/base/head_navbar.tmpl @@ -1,11 +1,3 @@ -{{$notificationUnreadCount := 0}} -{{if and .IsSigned .NotificationUnreadCount}} - {{$notificationUnreadCount = call .NotificationUnreadCount ctx}} -{{end}} -{{$activeStopwatch := NIL}} -{{if and .IsSigned EnableTimetracking .GetActiveStopwatch}} - {{$activeStopwatch = call .GetActiveStopwatch ctx}} -{{end}}