Merge branch 'master' into feat-healthchecks

2018-10-21 20:58:59 +03:00
parent a412951a30 f2c4e52fee
commit 81b24f61e8
80 changed files with 1881 additions and 1002 deletions
--- a/setup/Dockerfile
+++ b/setup/Dockerfile
@@ -10,8 +10,10 @@ RUN apk add --no-cache git curl \
 COPY server.py ./server.py
 COPY setup.py ./setup.py
 COPY main.py ./main.py
+COPY flavors /data/master/flavors
+COPY templates /data/master/templates

-RUN python setup.py https://github.com/mailu/mailu /data
+#RUN python setup.py https://github.com/mailu/mailu /data

 EXPOSE 80/tcp