* 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 dockertags/v1.21.12.1
| @@ -26,7 +26,8 @@ RUN apk update && \ | |||||
| -s /bin/bash \ | -s /bin/bash \ | ||||
| -u 1000 \ | -u 1000 \ | ||||
| -G git \ | -G git \ | ||||
| git | |||||
| git && \ | |||||
| echo "git:$(date +%s | sha256sum | base64 | head -c 32)" | chpasswd | |||||
| ENV USER git | ENV USER git | ||||
| ENV GITEA_CUSTOM /data/gitea | ENV GITEA_CUSTOM /data/gitea | ||||
| @@ -38,7 +39,4 @@ ENTRYPOINT ["/usr/bin/entrypoint"] | |||||
| CMD ["/bin/s6-svscan", "/etc/s6"] | CMD ["/bin/s6-svscan", "/etc/s6"] | ||||
| COPY docker / | COPY docker / | ||||
| COPY public /app/gitea/public | |||||
| COPY templates /app/gitea/templates | |||||
| COPY gitea /app/gitea/gitea | COPY gitea /app/gitea/gitea | ||||
| @@ -91,6 +91,11 @@ build: $(EXECUTABLE) | |||||
| $(EXECUTABLE): $(SOURCES) | $(EXECUTABLE): $(SOURCES) | ||||
| go build -v -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@ | 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 | .PHONY: release | ||||
| release: release-dirs release-build release-copy release-check | release: release-dirs release-build release-copy release-check | ||||
| @@ -2,5 +2,5 @@ | |||||
| [[ -f ./setup ]] && source ./setup | [[ -f ./setup ]] && source ./setup | ||||
| pushd /root > /dev/null | 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 | popd | ||||
| @@ -18,7 +18,6 @@ UseDNS no | |||||
| AllowAgentForwarding no | AllowAgentForwarding no | ||||
| AllowTcpForwarding no | AllowTcpForwarding no | ||||
| PrintMotd no | PrintMotd no | ||||
| PrintLastLog no | |||||
| PermitUserEnvironment yes | PermitUserEnvironment yes | ||||
| PermitRootLogin no | PermitRootLogin no | ||||