Skip to content

Commit

Permalink
Fixing multiple docker issues (#386)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
tboerger authored and lunny committed Dec 15, 2016
1 parent 1831ee2 commit c6b6a61
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docker/etc/s6/openssh/run
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion docker/etc/ssh/sshd_config
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ UseDNS no
AllowAgentForwarding no
AllowTcpForwarding no
PrintMotd no
PrintLastLog no

PermitUserEnvironment yes
PermitRootLogin no
Expand Down

0 comments on commit c6b6a61

Please sign in to comment.