summaryrefslogtreecommitdiffstats
path: root/Dockerfile
diff options
context:
space:
mode:
author无闻 <u@gogs.io>2015-10-02 15:59:10 -0400
committer无闻 <u@gogs.io>2015-10-02 15:59:10 -0400
commite5310cdbc1af0b9079c7c46c6433804c8e89661b (patch)
tree5c42ad03d532ff501cb942be893181298c33f11a /Dockerfile
parente34d0063c3e47ad71c94ea49142fd006cb29754b (diff)
parent3e7d8db7a2f52fcbe3e4a863d29d10eee90e2ff8 (diff)
downloadgitea-e5310cdbc1af0b9079c7c46c6433804c8e89661b.tar.gz
gitea-e5310cdbc1af0b9079c7c46c6433804c8e89661b.zip
Merge pull request #1731 from ogarcia/develop
Several bugfixes in Docker build
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile12
1 files changed, 2 insertions, 10 deletions
diff --git a/Dockerfile b/Dockerfile
index fd431a083b..1f5c9b5d99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,21 +9,13 @@ RUN echo "@edge http://dl-4.alpinelinux.org/alpine/edge/main" | tee -a /etc/apk/
&& apk -U --no-progress add ca-certificates bash git linux-pam s6@edge curl openssh socat \
&& chmod +x /usr/sbin/gosu
-# Configure Go and build Gogs
-ENV GOPATH /tmp/go
-ENV PATH $PATH:$GOPATH/bin
+ENV GOGS_CUSTOM /data/gogs
COPY . /app/gogs/
WORKDIR /app/gogs/
RUN ./docker/build.sh
-ENV GOGS_CUSTOM /data/gogs
-
-# Create git user for Gogs
-RUN adduser -D -g 'Gogs Git User' git -h /data/git/ -s /bin/sh && passwd -u git
-RUN echo "export GOGS_CUSTOM=/data/gogs" >> /etc/profile
-
# Configure Docker Container
VOLUME ["/data"]
EXPOSE 22 3000
-CMD ["./docker/start.sh"]
+CMD ["docker/start.sh"]