diff options
| author | Thomas Boerger <thomas@webhippie.de> | 2016-12-15 10:16:55 +0100 |
|---|---|---|
| committer | Lunny Xiao <xiaolunwen@gmail.com> | 2016-12-15 17:16:55 +0800 |
| commit | c6b6a61bf1feee6f735b74694a96e8a21c6b673d (patch) | |
| tree | 69b9fab521a8b236afc6c0f8bafab8734c5c5e51 /Dockerfile | |
| parent | 1831ee2d1d22596c3c697c11073e84be61ce5c5d (diff) | |
| download | gitea-c6b6a61bf1feee6f735b74694a96e8a21c6b673d.tar.gz gitea-c6b6a61bf1feee6f735b74694a96e8a21c6b673d.zip | |
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
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 6 |
1 files changed, 2 insertions, 4 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 |