From 03e49531d1f5a72e3d4a90f9e3f80520d8842a49 Mon Sep 17 00:00:00 2001
From: Thomas Boerger <thomas@webhippie.de>
Date: Wed, 14 Dec 2016 17:10:12 +0100
Subject: [PATCH 1/5] Added stupid docker task to makefile

---
 Makefile | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Makefile b/Makefile
index ae049d0086478..bc6c05c323e34 100644
--- a/Makefile
+++ b/Makefile
@@ -91,6 +91,11 @@ build: $(EXECUTABLE)
 $(EXECUTABLE): $(SOURCES)
 	go build -v -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@
 
+.PHONY: docker
+docker:
+	docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="$(TAGS)" webhippie/golang:edge make clean generate build
+	docker build -t gitea/gitea:latest .
+
 .PHONY: release
 release: release-dirs release-build release-copy release-check
 

From 4e2f9a0981b060201186e3aaa3da111f221e2dfa Mon Sep 17 00:00:00 2001
From: Thomas Boerger <thomas@webhippie.de>
Date: Wed, 14 Dec 2016 17:10:44 +0100
Subject: [PATCH 2/5] Dropped unknown option PrintLastLog from docker ssh
 config

---
 docker/etc/ssh/sshd_config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docker/etc/ssh/sshd_config b/docker/etc/ssh/sshd_config
index 991b5196a0e70..0248a2e8dcd21 100644
--- a/docker/etc/ssh/sshd_config
+++ b/docker/etc/ssh/sshd_config
@@ -18,7 +18,6 @@ UseDNS no
 AllowAgentForwarding no
 AllowTcpForwarding no
 PrintMotd no
-PrintLastLog no
 
 PermitUserEnvironment yes
 PermitRootLogin no

From d8612795dd8bd8c2621aa5a4c5b9c9a1bb8b0978 Mon Sep 17 00:00:00 2001
From: Thomas Boerger <thomas@webhippie.de>
Date: Wed, 14 Dec 2016 17:11:10 +0100
Subject: [PATCH 3/5] OpenSSH should log to docker stdout

---
 docker/etc/s6/openssh/run | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/etc/s6/openssh/run b/docker/etc/s6/openssh/run
index 46f422cce6550..502e7f6dde2cd 100755
--- a/docker/etc/s6/openssh/run
+++ b/docker/etc/s6/openssh/run
@@ -2,5 +2,5 @@
 [[ -f ./setup ]] && source ./setup
 
 pushd /root > /dev/null
-    exec su-exec root /usr/sbin/sshd -E /var/log/sshd.log -D
+    exec su-exec root /usr/sbin/sshd -D
 popd

From 181ad586b9c20d800c19e583d44bbcea22d9c29b Mon Sep 17 00:00:00 2001
From: Thomas Boerger <thomas@webhippie.de>
Date: Wed, 14 Dec 2016 17:11:59 +0100
Subject: [PATCH 4/5] Set random pw for docker git user, otherwise it is locked

---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 775d202e33752..fd72a6ffcc0c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,7 +26,8 @@ RUN apk update && \
     -s /bin/bash \
     -u 1000 \
     -G git \
-    git
+    git && \
+  echo "git:$(date +%s | sha256sum | base64 | head -c 32)" | chpasswd
 
 ENV USER git
 ENV GITEA_CUSTOM /data/gitea

From b01cf8ff6c021148d0498e107a10fac55df5ccdc Mon Sep 17 00:00:00 2001
From: Thomas Boerger <thomas@webhippie.de>
Date: Wed, 14 Dec 2016 17:12:21 +0100
Subject: [PATCH 5/5] Stop using templates and public within docker

---
 Dockerfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fd72a6ffcc0c4..2d47a18ba614c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -39,7 +39,4 @@ ENTRYPOINT ["/usr/bin/entrypoint"]
 CMD ["/bin/s6-svscan", "/etc/s6"]
 
 COPY docker /
-
-COPY public /app/gitea/public
-COPY templates /app/gitea/templates
 COPY gitea /app/gitea/gitea