Merge branch 'dev' into feature-websockets-status

docker/docker-compose.env

@@ -32,8 +32,3 @@
 # The default language to use for OCR. Set this to the language most of your
 # documents are written in.
 #PAPERLESS_OCR_LANGUAGE=eng
-
-# By default Paperless does not OCR a document if the text can be retrieved from
-# the document directly. Set to true to always OCR documents. (i.e., if you
-# know that some of your documents have faulty/bad OCR data)
-#PAPERLESS_OCR_ALWAYS=true

docker/docker-entrypoint.sh

@@ -23,8 +23,9 @@ wait_for_postgres() {
 	echo "Waiting for PostgreSQL to start..."
 
 	host="${PAPERLESS_DBHOST}"
+	port="${PAPERLESS_DBPORT}"
 
-	while !</dev/tcp/$host/5432 ;
+	while !</dev/tcp/$host/$port ;
 	do
 
 		if [ $attempt_num -eq $max_attempts ]

docker/hub/docker-compose.postgres.yml

@@ -15,7 +15,7 @@ services:
       POSTGRES_PASSWORD: paperless
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.1
+    image: jonaswinkler/paperless-ng:0.9.5
     restart: always
     depends_on:
       - db

docker/hub/docker-compose.sqlite.yml

@@ -5,7 +5,7 @@ services:
     restart: always
 
   webserver:
-    image: jonaswinkler/paperless-ng:0.9.1
+    image: jonaswinkler/paperless-ng:0.9.5
     restart: always
     depends_on:
       - broker

docker/local/Dockerfile

@@ -11,12 +11,17 @@ RUN apt-get update \
 		curl \
 		ghostscript \
 		gnupg \
+		icc-profiles-free \
 		imagemagick \
 		libatlas-base-dev \
+		liblept5 \
 		libmagic-dev \
 		libpoppler-cpp-dev \
 		libpq-dev \
+		libxml2 \
 		optipng \
+		pngquant \
+		qpdf \
 		sudo \
 		tesseract-ocr \
 		tesseract-ocr-eng \
@@ -26,6 +31,7 @@ RUN apt-get update \
 		tesseract-ocr-spa \
 		tzdata \
 		unpaper \
+		zlib1g \
 	&& pip3 install --upgrade supervisor setuptools \
 	&& pip install --no-cache-dir -r requirements.txt \
 	&& apt-get -y purge build-essential \