Merge branch 'master' into refactor-config

This commit is contained in:
kaiyou
2018-11-08 21:43:05 +01:00
111 changed files with 2696 additions and 1098 deletions

View File

@@ -1,17 +1,21 @@
FROM python:3-alpine
FROM alpine:3.8
# python3 shared with most images
RUN apk add --no-cache \
python3 py3-pip \
&& pip3 install --upgrade pip
# Image specific layers under this line
RUN mkdir -p /app
WORKDIR /app
COPY requirements-prod.txt requirements.txt
RUN apk add --no-cache openssl \
&& apk add --no-cache --virtual build-dep openssl-dev libffi-dev python-dev build-base \
&& pip install -r requirements.txt \
RUN apk add --no-cache openssl curl \
&& apk add --no-cache --virtual build-dep openssl-dev libffi-dev python3-dev build-base \
&& pip3 install -r requirements.txt \
&& apk del --no-cache build-dep
COPY mailu ./mailu
COPY migrations ./migrations
COPY start.sh /start.sh
COPY start.py /start.py
RUN pybabel compile -d mailu/translations
@@ -19,4 +23,6 @@ EXPOSE 80/tcp
VOLUME ["/data"]
ENV FLASK_APP mailu
CMD ["/start.sh"]
CMD /start.py
HEALTHCHECK CMD curl -f -L http://localhost/ui || exit 1