From a4643fdef6fa73f4fbe647b943ece90bbf9bfe6d Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 24 Oct 2019 16:23:14 +0900 Subject: [PATCH] Update gitea to 1.9.5 This reverts commit c53c87621fc553ba96174f97dcdaf540a516d94c. Change-Id: I616ad7c631b72ebd704cce1ab4a6d5f1ca188285 --- docker/gitea/Dockerfile | 6 +++--- docker/gitea/custom/templates/repo/header.tmpl | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile index 90e85dbda1..c3075c048c 100644 --- a/docker/gitea/Dockerfile +++ b/docker/gitea/Dockerfile @@ -22,11 +22,11 @@ ################################### #Build stage -FROM golang:1.11-stretch AS build-env +FROM docker.io/library/golang:1.13-buster AS build-env LABEL maintainer="infra-root@openstack.org" -ARG GITEA_VERSION=6eb53ac570ab9af51fc9cbd79f1db782edce57e0 +ARG GITEA_VERSION="v1.9.5" ENV TAGS "bindata $TAGS" #Build deps @@ -44,7 +44,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then git checkout "${GITEA_VERSION}"; fi \ ################################### # Basic system setup common to all containers in our pod -FROM debian:testing as base +FROM docker.io/library/debian:buster-slim as base RUN apt-get update && apt-get -y install \ bash \ diff --git a/docker/gitea/custom/templates/repo/header.tmpl b/docker/gitea/custom/templates/repo/header.tmpl index d264c3682b..fe361b8aa6 100644 --- a/docker/gitea/custom/templates/repo/header.tmpl +++ b/docker/gitea/custom/templates/repo/header.tmpl @@ -3,7 +3,11 @@