opendev
/
system-config
Code Issues Proposed changes

Merge "Switch to upstream and upgrade gitea to current master (pre-1.9.0)"

This commit is contained in:
Zuul 2019-05-23 01:15:17 +00:00 committed by Gerrit Code Review
parent e38c56757f ead3f63649
commit 9e75dbd53b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/gitea/Dockerfile
View File

@ -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