From c53c87621fc553ba96174f97dcdaf540a516d94c Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 24 Oct 2019 09:17:00 +0900
Subject: [PATCH] Revert "Update gitea to 1.9.4"

Also Revert "Update gitea build to golang 1.13 on buster-slim"

1.9.4 has a bug where doing a get as an unauthenticated user
results in a 500:

http://paste.openstack.org/show/785534/

A pull request has been submitted upstream:

https://github.com/go-gitea/gitea/pull/8653

This reverts commit 1993d985d037a24f31c85026d8add2a8d23b4d9a.
This reverts commit cedb272a9bcbc044180b5caef81567673b0434ff.

Change-Id: I75c117d0dc851f7b3c389a19ad0c8e233886b250
---
 docker/gitea/Dockerfile                        | 6 +++---
 docker/gitea/custom/templates/repo/header.tmpl | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile
index e03ad11849..90e85dbda1 100644
--- a/docker/gitea/Dockerfile
+++ b/docker/gitea/Dockerfile
@@ -22,11 +22,11 @@
 
 ###################################
 #Build stage
-FROM docker.io/library/golang:1.13-buster AS build-env
+FROM golang:1.11-stretch AS build-env
 
 LABEL maintainer="infra-root@openstack.org"
 
-ARG GITEA_VERSION=v1.9.4
+ARG GITEA_VERSION=6eb53ac570ab9af51fc9cbd79f1db782edce57e0
 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 docker.io/library/debian:buster-slim as base
+FROM debian:testing 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 fe361b8aa6..d264c3682b 100644
--- a/docker/gitea/custom/templates/repo/header.tmpl
+++ b/docker/gitea/custom/templates/repo/header.tmpl
@@ -3,11 +3,7 @@
 	<div class="ui container">
 		<div class="repo-header">
 			<div class="ui huge breadcrumb repo-title">
-				{{if .RelAvatarLink}}
-				<img class="ui avatar image" src="{{.RelAvatarLink}}">
-				{{else}}
 				<i class="mega-octicon octicon-{{if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else if .IsFork}}repo-forked{{else}}repo{{end}}"></i>
-				{{end}}
 				<a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a>
 				<div class="divider"> / </div>
 				<a href="{{$.RepoLink}}">{{.Name}}</a>