From 385e89d21ecbd638a42911e6444829f74e7d8daa Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 4 Feb 2020 13:14:42 -0600 Subject: [PATCH] Upgrade gitea to 1.11.1 Gitea build needs npm now, so add the installation. Change-Id: I250dbedf5fb0b30f5f80d23ff67f0b445ce3eb9d --- docker/gitea/Dockerfile | 8 ++++++-- docker/gitea/custom/templates/base/head_navbar.tmpl | 3 ++- docker/gitea/custom/templates/pwa/manifest_json.tmpl | 10 +++++----- docker/gitea/custom/templates/repo/header.tmpl | 4 +++- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile index 863edd71ad..0a40451658 100644 --- a/docker/gitea/Dockerfile +++ b/docker/gitea/Dockerfile @@ -26,11 +26,15 @@ FROM docker.io/library/golang:1.13-buster AS build-env LABEL maintainer="infra-root@openstack.org" -ARG GITEA_VERSION="v1.10.3" +ARG GITEA_VERSION="v1.11.1" ENV TAGS "bindata $TAGS" #Build deps -RUN apt-get update && apt-get -y install build-essential git \ +RUN apt-get update && 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_10.x bionic main" | tee /etc/apt/sources.list.d/nodesource.list \ + && apt-get update \ + && apt-get -q --option "Dpkg::Options::=--force-confold" --assume-yes install nodejs \ && mkdir -p ${GOPATH}/src/code.gitea.io/gitea #Setup repo diff --git a/docker/gitea/custom/templates/base/head_navbar.tmpl b/docker/gitea/custom/templates/base/head_navbar.tmpl index 9ed761823b..64970b0200 100644 --- a/docker/gitea/custom/templates/base/head_navbar.tmpl +++ b/docker/gitea/custom/templates/base/head_navbar.tmpl @@ -1,7 +1,7 @@