Merge branch 'dev' into travis-multiarch-builds

This commit is contained in:
jonaswinkler
2020-12-28 17:54:48 +01:00
71 changed files with 1256 additions and 739 deletions

View File

@@ -30,6 +30,7 @@ RUN apt-get update \
&& apt-get -y --no-install-recommends install \
build-essential \
curl \
fonts-liberation \
ghostscript \
gnupg \
icc-profiles-free \
@@ -93,6 +94,7 @@ RUN sudo -HEu paperless python3 manage.py collectstatic --clear --no-input
VOLUME ["/usr/src/paperless/data", "/usr/src/paperless/media", "/usr/src/paperless/consume", "/usr/src/paperless/export"]
ENTRYPOINT ["/sbin/docker-entrypoint.sh"]
EXPOSE 8000
CMD ["/usr/local/bin/supervisord", "-c", "/etc/supervisord.conf"]
LABEL maintainer="Jonas Winkler <dev@jpwinkler.de>"