From c6b6a61bf1feee6f735b74694a96e8a21c6b673d Mon Sep 17 00:00:00 2001
From: Thomas Boerger <thomas@webhippie.de>
Date: Thu, 15 Dec 2016 10:16:55 +0100
Subject: [PATCH] Fixing multiple docker issues (#386)
* Added stupid docker task to makefile
* Dropped unknown option PrintLastLog from docker ssh config
* OpenSSH should log to docker stdout
* Set random pw for docker git user, otherwise it is locked
* Stop using templates and public within docker
---
Dockerfile | 6 ++----
Makefile | 5 +++++
docker/etc/s6/openssh/run | 2 +-
docker/etc/ssh/sshd_config | 1 -
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 775d202e33..2d47a18ba6 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
@@ -38,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
diff --git a/Makefile b/Makefile
index ae049d0086..bc6c05c323 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
diff --git a/docker/etc/s6/openssh/run b/docker/etc/s6/openssh/run
index 46f422cce6..502e7f6dde 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
diff --git a/docker/etc/ssh/sshd_config b/docker/etc/ssh/sshd_config
index 991b5196a0..0248a2e8dc 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