Update to v1.7.1 upstream

tux2000 · Jul 4, 2022 · 8b2b7c0 · 8b2b7c0
1 parent cf328bf
commit 8b2b7c0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/paperless-ngx/CHANGELOG.md b/paperless-ngx/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.7.1-0
+- Upgrade to paperless-ngx v1.7.1
+- Set empty string for NULL value in PAPERLESS_URL
+
 ## 1.7.0-0
 - Upgrade to paperless-ngx v1.7.0
 - Expose functionality to install additional OCR languages

diff --git a/paperless-ngx/Dockerfile b/paperless-ngx/Dockerfile
@@ -47,10 +47,10 @@ RUN apt-get update \
     zlib1g \
     && mkdir /var/log/supervisord /var/run/supervisord
 
-RUN wget -O paperless.tar.xz https://github.com/paperless-ngx/paperless-ngx/releases/download/ngx-1.7.0/paperless-ngx-1.7.0.tar.xz \
+RUN wget -O paperless.tar.xz https://github.com/paperless-ngx/paperless-ngx/releases/download/v1.7.1/paperless-ngx-v1.7.1.tar.xz \
     && 7z x paperless.tar.xz \
     && 7z x paperless.tar -o/usr/src/ \
-    && cd /usr/src 
+    && cd /usr/src
 
 # Fix aarch64 builds
 # see: https://github.com/pikepdf/pikepdf/issues/194#issuecomment-1020419586
@@ -83,7 +83,7 @@ RUN sed -i "s/bind .*/bind 127.0.0.1/g" /etc/redis/redis.conf
 # Clean Up
 RUN apt-get -y purge build-essential libqpdf-dev \
     && apt-get -y autoremove --purge \
-    && rm -rf /var/lib/apt/lists/* 
+    && rm -rf /var/lib/apt/lists/*
 
 # copy scripts
 # FROM ORIGINAL DOCKER FILE: this fixes issues with imagemagick and PDF

diff --git a/paperless-ngx/config.json b/paperless-ngx/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Paperless-ngx",
-  "version": "1.7.0-1",
+  "version": "1.7.1-0",
   "slug": "paperless",
   "url": "https://github.com/paperless-ngx/paperless-ngx",
   "description": "Paperless is an application that manages your personal documents. With the help of a document scanner, paperless transforms your wieldy physical document binders into a searchable archive and provides many utilities for finding and managing your documents.",

diff --git a/paperless-ngx/scripts/docker-entrypoint.sh b/paperless-ngx/scripts/docker-entrypoint.sh
@@ -10,7 +10,7 @@ echo "Entry script"
 ./scripts/wait-for-redis.sh
 
 # Load config
-export PAPERLESS_URL=$(jq --raw-output ".url" $CONFIG_PATH)
+export PAPERLESS_URL=$(jq --raw-output ".url // ''" $CONFIG_PATH)
 export PAPERLESS_FILENAME_FORMAT=$(jq --raw-output ".filename.format" $CONFIG_PATH)
 export PAPERLESS_OCR_LANGUAGE=$(jq --raw-output ".ocr.language" $CONFIG_PATH)
 export PAPERLESS_OCR_LANGUAGES=$(jq --raw-output ".ocr.languages" $CONFIG_PATH)