From ead3f63649ae9fb29c472eca8e0740b63b92d749 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Wed, 22 May 2019 14:49:40 -0700
Subject: [PATCH] Switch to upstream and upgrade gitea to current master
 (pre-1.9.0)

The current gitea master has our change to avoid indexing extra
refs, so we can start replicating refs/changes and refs/notes to
it.  It also fixes a bug we observed when viewing the index of
the starlingx/integ repo.

This also switches us back to the upstream repo, though since
we're using an intermediate commit, the version displayed in
the web ui will be "6eb53ac570ab9af51fc9cbd79f1db782edce57e0".

The docker entrypoint script has moved, so the Dockerfile is updated
to reflect that.

Change-Id: I47769fc1ca62a39122d96a1fc0c1bfc2caca6a4f
---
 docker/gitea/Dockerfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/gitea/Dockerfile b/docker/gitea/Dockerfile
index 1df4e5720a..069dda8b64 100644
--- a/docker/gitea/Dockerfile
+++ b/docker/gitea/Dockerfile
@@ -26,7 +26,7 @@ FROM golang:1.11-stretch AS build-env
 
 LABEL maintainer="infra-root@openstack.org"
 
-ARG GITEA_VERSION=opendev-1.8.0
+ARG GITEA_VERSION=6eb53ac570ab9af51fc9cbd79f1db782edce57e0
 ENV TAGS "bindata $TAGS"
 
 #Build deps
@@ -34,7 +34,7 @@ RUN apt-get update && apt-get -y install build-essential git \
   && mkdir -p ${GOPATH}/src/code.gitea.io/gitea
 
 #Setup repo
-RUN git clone https://github.com/jeblair/gitea ${GOPATH}/src/code.gitea.io/gitea
+RUN git clone https://github.com/go-gitea/gitea ${GOPATH}/src/code.gitea.io/gitea
 WORKDIR ${GOPATH}/src/code.gitea.io/gitea
 
 #Checkout version if set
@@ -69,7 +69,7 @@ RUN addgroup --system --gid 1000 git \
   && mkdir /custom
 
 # Copy the /etc config files and entrypoint script
-COPY --from=build-env /go/src/code.gitea.io/gitea/docker /
+COPY --from=build-env /go/src/code.gitea.io/gitea/docker/root /
 # Copy our custom sshd_config
 COPY sshd_config /etc/ssh/sshd_config